* [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/files/1.25.0/, www-misc/zoneminder/
@ 2011-09-01 20:59 Andreas Hüttel
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Hüttel @ 2011-09-01 20:59 UTC (permalink / raw
To: gentoo-commits
commit: a5aa609c955ebef36a33e405fad156b1f12c25f4
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Thu Sep 1 20:58:34 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Sep 1 20:58:55 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=a5aa609c
[www-misc/zoneminder] Started working on version bump
(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
www-misc/zoneminder/ChangeLog | 7 +++
www-misc/zoneminder/Manifest | 33 ++++++++-------
www-misc/zoneminder/files/1.25.0/Makefile.am.patch | 19 ++++++++
...nder-1.24.2.ebuild => zoneminder-1.25.0.ebuild} | 44 ++++++++++----------
4 files changed, 65 insertions(+), 38 deletions(-)
diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog
index bdedef9..cf71c0c 100644
--- a/www-misc/zoneminder/ChangeLog
+++ b/www-misc/zoneminder/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/Attic/ChangeLog,v 1.41 2011/04/04 12:11:35 scarabeus Exp $
+*zoneminder-1.25.0 (01 Sep 2011)
+
+ 01 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ +files/1.25.0/Makefile.am.patch, -zoneminder-1.24.2.ebuild,
+ +zoneminder-1.25.0.ebuild:
+ Started working on version bump
+
---------------------------------------------------------------------------
Copied from CVS attic to dilfridge overlay
---------------------------------------------------------------------------
diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index 9255575..615747c 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -7,27 +7,28 @@ AUX 1.24.2/zm_build_fix.patch 407 RMD160 ac45177bb3f06dd0fd9cd1f938b90ba2297d07d
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.patch 1424 RMD160 7a9708fa416f7e37bfbf8c6934d382541c066c37 SHA1 cc452ac6f332d7932c8ee456347d537fa625b7b6 SHA256 53f476ddd7300f5bfced08a7665c433c9be3f0286723ade8af3283d9b9b06a71
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.24.2.tar.gz 965521 RMD160 3ec5ca1a6d418feeeecd6dc3c4a78a79f5ead373 SHA1 ea854c941b83374a352d7d794a4462e279fea487 SHA256 fd8475138ccee8870534f1210a3d1e3e1990e963dd73146a6d310dc71c463dca
-EBUILD zoneminder-1.24.2.ebuild 4084 RMD160 ca439d5f50282c1da78147a6668bbd136dfa6528 SHA1 ef75e0b0abb4a280cab57b93088f3c2d28447df2 SHA256 136436c29def540e5abd519440dc43b57cf012458fbc073c2001928b0e6c0df5
-MISC ChangeLog 7615 RMD160 1076c8a97c96eb16b38a65e61b419f8c85a83c20 SHA1 590c0fe09b124e6e714035de0890f21600f87ad5 SHA256 a209c01ca9c52c69728a11f9d6439a74aeb72c6e63e343fd996e9a2aab0db76a
+DIST ZoneMinder-1.25.0.tar.gz 1119091 RMD160 32a4f503770103e55bfe592864c1cab82e7395a6 SHA1 a93a976a5cd82f1e197f4d7bd626d3f0387c4231 SHA256 ec63ef47d8f4cb8af21a3bc84ff1de6968805146682dd7f10982bde975d9bb5d
+EBUILD zoneminder-1.25.0.ebuild 3916 RMD160 41445ccf66dd51bcf9065bf0a729dea6fe84e970 SHA1 4a116c4af0559e7b9aae9178725d49cb798dff0b SHA256 9b435a1fd7a867314ee6ad8c7400796ea09d573ce3875b49c681c92dfa406b7c
+MISC ChangeLog 7832 RMD160 6ee9be50b5925df5ad39347aa7e4c477808096fc SHA1 20aa4fb2abf94e250e608ce32f42bf8a4eb5a063 SHA256 0c42075e7a943aaa795ec73e0f978e53e84cb26cc39c80f4fa097d16e9898345
MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJOX+ZEAAoJENwGBM22xffeM70P/jniU2ri1KBlOfGep4diUnMO
-iu2BJXBOS2bc82fxl2AHtb4AXXndM7EGS8WYXebUjU8aKUHgnCyFr8BoLqzw4M3j
-bSxvLM/crFPMiLVROQltXUIXGXAUZHSVByPA4HjReN2Sehji+OC/9wC4xAJf41/f
-c8z5GK+CBheyQbXMIIkh7g4NqUvu8vTPPCCFDSP3lLo5M1Uuao57CG3AZE9y2UQs
-asPzj0gaV9hPgROTZCYOUBRMeKLPr2H2XuLtrhrL0DiU0x5HfKlmfqP8nZh2Dvnh
-ddVHto3O63h69ORbNcY7hXt9kdumpBoyJfbaNvfSIs9XXQRcbHCotErbmNEV3SQG
-PHDJzYXYrnJpmJiTDJ0XKbBVPPgkpOYpLuqv0VhW7/8l+gpO1mnO0C0Gv7JIulEF
-1v8Sgo7ZTFd5oYV+nUq+jVyNjcGIzxq0ykqb+/bqDdyl3RNS/kYC7Wcxb4fe6PJa
-b2lK1ji8phg9I4nm6wDuU+Tqdi4B6TOtm4al3iw9xkA1YmuQmFhErvop0g9MSL2E
-xBwGCQ3uEGcUxH0mA4WJGpH9Cb975C8oIZwwHiVeB1fbMHCnQ/UfEhIORu7Y+wAG
-vx4x0xW+IqtmJuZr8gcd6NCKTCRCQZh328X0Rzs/LO8itLHlP8IcRM2oiPJmnuT7
-sogEhkuXIiTuMYczRWE7
-=C6EF
+iQIcBAEBCgAGBQJOX/H6AAoJENwGBM22xffehgsP/RXqKFmBqdtHV7hBVgofOTpS
+0xw24nn9SL0sI48HFpmt4kp/F2yalrZoHG7/N5cyUV0ho+6lGdn4ZrRM/WyRKrQM
+B5jnGIPIHLftrRgM2XAh8lyavTkpq5x18MUtbBVx0oSs2g+Z+teBf95BMa6mQHCC
+8eQX1ZR6GOItkLrL/z0IWXmp83wWepOjQlg0HxK8NRkw9PMFYChp/SklJatdcNZh
+KliwKr0RUUAh6NnKhpwimdTyFg7maB3EN9BYiGh6LrklfW5BR4zFdWVviQ/oktQb
+vxZiHNhGl5uUKFtMGy13M5/RR6d6G7LnFXbgANlZV1xHW6H1TkU3XiLGgDnVIdli
+veDnV8OlwAr8J/nqQupLaXu0xuskqXvuUuX4de20njGO6+jQpoewAEpl68pRoIVq
+y54E5UUrMEiUJNW2y0J4D6hqiByFz7W6x+NBCBeTTBV9YESu2T5Yu6g8eLBVGkNB
+9Oe+kib0AZxzxO/LR6lpxyUINJSBW/Soz8zUjf/XAT6+ZipwhJgIuIlKqxmv9F8y
+Ne7Vp0hz9a4TW3YoL0Azg/Se/LCOjkkURUfikXPaBD6WfEFIbJEKKiS+Dah5MS3Q
+1gP4LK6ruZe0WQ1bvOtsDFzVQjVvz3SW9KZ0LgHSxKAYNLgvZUvTEx/Ca4IgQCnX
+3wE/Rd5hLLNbHIhPKLE6
+=jxHs
-----END PGP SIGNATURE-----
diff --git a/www-misc/zoneminder/files/1.25.0/Makefile.am.patch b/www-misc/zoneminder/files/1.25.0/Makefile.am.patch
new file mode 100644
index 0000000..bba895e
--- /dev/null
+++ b/www-misc/zoneminder/files/1.25.0/Makefile.am.patch
@@ -0,0 +1,19 @@
+diff -ruN ZoneMinder-1.25.0-0-vanilla/Makefile.am ZoneMinder-1.25.0/Makefile.am
+--- ZoneMinder-1.25.0-0-vanilla/Makefile.am 2011-05-20 11:39:37.000000000 +0200
++++ ZoneMinder-1.25.0/Makefile.am 2011-09-01 22:52:32.000000000 +0200
+@@ -19,11 +19,12 @@
+ zmconfgen.pl.in
+
+ # Yes, you are correct. This is a HACK!
++# we need to set the permissions in the ebuild anyway since the installer may be running userpriv
+ install-data-hook:
+ ( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )
+- ( 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 )
+- ( 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 )
+- ( 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 )
++ ( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; )
++ ( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -m 700 -p $(DESTDIR)$(ZM_TMPDIR); )
++ ( if ! test -e $(DESTDIR)$(ZM_LOGDIR); then mkdir -p $(DESTDIR)$(ZM_LOGDIR); fi; )
+
+ uninstall-hook:
+ @-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp )
diff --git a/www-misc/zoneminder/zoneminder-1.24.2.ebuild b/www-misc/zoneminder/zoneminder-1.25.0.ebuild
similarity index 82%
rename from www-misc/zoneminder/zoneminder-1.24.2.ebuild
rename to www-misc/zoneminder/zoneminder-1.25.0.ebuild
index 3ffc802..b95fa0b 100644
--- a/www-misc/zoneminder/zoneminder-1.24.2.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.25.0.ebuild
@@ -2,21 +2,19 @@
# Distributed under the terms of the GNU General Public License v2
# $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 $
-inherit eutils autotools depend.php depend.apache multilib
+EAPI=4
-MY_PV=${PV/_/-}
-MY_PN="ZoneMinder"
+inherit eutils base autotools depend.php depend.apache multilib
-PATCH_PV="1.24.2"
+MY_PN="ZoneMinder"
DESCRIPTION="ZoneMinder allows you to capture, analyse, record and monitor any cameras attached to your system."
HOMEPAGE="http://www.zoneminder.com/"
-SRC_URI="http://www.zoneminder.com/downloads/${MY_PN}-${MY_PV}.tar.gz"
+SRC_URI="http://www.zoneminder.com/downloads/${MY_PN}-${PV}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS=""
IUSE="debug ffmpeg"
-#IUSE="debug ffmpeg mmap"
SLOT="0"
DEPEND="app-admin/sudo
@@ -49,27 +47,27 @@ RDEPEND="dev-perl/DBD-mysql
need_apache
need_php_httpd
-S=${WORKDIR}/${MY_PN}-${MY_PV}
+S=${WORKDIR}/${MY_PN}-${PV}
+
+PATCHES=(
+ "${FILESDIR}"/1.25.0/Makefile.am.patch
+ "${FILESDIR}"/1.24.2/zm_create.sql.in.patch
+ "${FILESDIR}"/1.24.2/zm_remote_camera_http.patch
+ "${FILESDIR}"/1.24.2/db_upgrade_script_location.patch
+ "${FILESDIR}"/1.24.2/zm_jpeg.patch
+ "${FILESDIR}"/1.24.2/zm_build_fix.patch
+)
pkg_setup() {
require_php_with_use mysql sockets apache2
}
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}"/${PATCH_PV}/Makefile.am.patch
- epatch "${FILESDIR}"/${PATCH_PV}/zm_create.sql.in.patch
- epatch "${FILESDIR}"/${PATCH_PV}/zm_remote_camera_http.patch
- epatch "${FILESDIR}"/${PATCH_PV}/db_upgrade_script_location.patch
- epatch "${FILESDIR}"/${PATCH_PV}/zm_jpeg.patch
- epatch "${FILESDIR}"/${PATCH_PV}/zm_build_fix.patch
-
+src_prepare() {
+ base_src_prepare
eautoreconf
}
-src_compile() {
+src_configure() {
local myconf
# To enable mmap support we need a dependancy of Sys::Mmap
@@ -94,14 +92,16 @@ src_compile() {
--with-webuser=apache \
--with-webgroup=apache \
${myconf}
+}
+src_compile() {
einfo "${PN} does not parallel build... using forcing make -j1..."
- emake -j1 || die "emake failed"
+ emake -j1
}
src_install() {
keepdir /var/run/zm
- emake -j1 DESTDIR="${D}" install || die "emake install failed"
+ emake -j1 DESTDIR="${D}" install
fperms 0640 /etc/zm.conf
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/files/1.25.0/, www-misc/zoneminder/
@ 2011-09-17 22:30 Andreas Hüttel
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Hüttel @ 2011-09-17 22:30 UTC (permalink / raw
To: gentoo-commits
commit: 4a299c2c350175f7e00016cf2d483c08fb84db9d
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 22:30:50 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 22:30:50 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=4a299c2c
Patched all chown out of makefiles
(Portage version: 2.1.10.17/git/Linux x86_64, signed Manifest commit with key 7887F787)
---
www-misc/zoneminder/ChangeLog | 5 +++
www-misc/zoneminder/Manifest | 33 ++++++++++---------
.../zoneminder/files/1.25.0/Makefile.am.2.patch | 23 ++++++++++++++
www-misc/zoneminder/files/1.25.0/Makefile.am.patch | 2 +-
www-misc/zoneminder/zoneminder-1.25.0.ebuild | 1 +
5 files changed, 47 insertions(+), 17 deletions(-)
diff --git a/www-misc/zoneminder/ChangeLog b/www-misc/zoneminder/ChangeLog
index ecce77a..5c754bb 100644
--- a/www-misc/zoneminder/ChangeLog
+++ b/www-misc/zoneminder/ChangeLog
@@ -3,6 +3,11 @@
# $Header: /var/cvsroot/gentoo-x86/www-misc/zoneminder/Attic/ChangeLog,v 1.41 2011/04/04 12:11:35 scarabeus Exp $
17 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ +files/1.25.0/Makefile.am.2.patch, files/1.25.0/Makefile.am.patch,
+ zoneminder-1.25.0.ebuild:
+ Patched all chown out of makefiles
+
+ 17 Sep 2011; Andreas K. Huettel <dilfridge@gentoo.org>
zoneminder-1.25.0.ebuild:
Build against openssl because of bug 285151
diff --git a/www-misc/zoneminder/Manifest b/www-misc/zoneminder/Manifest
index 7efc1fc..90d5d94 100644
--- a/www-misc/zoneminder/Manifest
+++ b/www-misc/zoneminder/Manifest
@@ -7,28 +7,29 @@ AUX 1.24.2/zm_build_fix.patch 407 RMD160 ac45177bb3f06dd0fd9cd1f938b90ba2297d07d
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.patch 1424 RMD160 7a9708fa416f7e37bfbf8c6934d382541c066c37 SHA1 cc452ac6f332d7932c8ee456347d537fa625b7b6 SHA256 53f476ddd7300f5bfced08a7665c433c9be3f0286723ade8af3283d9b9b06a71
+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 3740 RMD160 a34e4113557c71714058c9f009bf10f8591cd55e SHA1 ecfbdcdf73cafdc3682d5dfc736ccbd73fc032d4 SHA256 46be64af8217eb5c2dc1f0ba0d18bf66646cb06ec33efdfc45b7ba220ece2f7d
-MISC ChangeLog 8189 RMD160 70acc9696ca523a464eda66c47d691b9be49f736 SHA1 4665360b519a4a6ec5172665cd765f222d511459 SHA256 f9fbbb1ab3ef931b40bb986e88ce665fce5f778ce7a0f5ae5071d8b8151bcc15
+EBUILD zoneminder-1.25.0.ebuild 3782 RMD160 946a6519eb58ab827bc7a4a6b64a7e420822624c SHA1 06fb3487002b0846bc194b5d90dbef5e4b250838 SHA256 904b0d5c9f7cac6b52b4052ed0d199869795cfc21ed00dee618f3ab8d7fe8999
+MISC ChangeLog 8381 RMD160 571a60fba206623f4fe400388ae9468e5eb39f78 SHA1 cfe6c2272ec5ac149cca92ce3646fafc092f5eb2 SHA256 71878be30cbb65303516b368dcbfbad0f77e04b0482b3fc96b7a37e81927aca6
MISC metadata.xml 262 RMD160 24e1a7cfcbca1e2f41e8c062c448d9150f6320b8 SHA1 951224aa9eb92e898209936836a18e844ae1f169 SHA256 7e8dde52c550f9cfc6d74b78c19f6900a8cc241f2bf136610a4fc3b0aa95f3f5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQIcBAEBCgAGBQJOdPWTAAoJEEb+UGWnxTyHnzcQAKOpkfeROBEP3O2iZ5M80E4P
-mPCbjXK10N8qNC4SgC2q63T7E8KJYL1r0s9hgwuTo65ChSUJ9zrK3wU0wicsyInh
-UML/MBKtn60XwGrzxoQiZfZ27Xdo9fwRGdyaCVBYJZ6nzRAicNBD5DwsaneLg1yL
-tYrG0xit54ZR1BIXyRNSXMEQDj6uTj4Y5uTI4mQQRv43T2zzTr5qUSF4luIepiwm
-8s4sstN0Pu23V3cBKpIzhUn7TemM6wuIRKtF7AMUkH0Sq9BsSbyLDpefLWdA2/xj
-FWwPoUx2ildWRIj8PBI2Pp6khaYL0j05vLBjV+P+tm1caVdbCCDpWFXEvcWGCqcB
-z8Mvs+HRBtGVEFfD3Dih1iWb8SWG8owEz3z77QZowahtNnyAGt/Nmg3UnLwZoCKN
-oAIMiMy5sfe97h4GwjKel9KLHsjuk2Smo/E9Gg28AZ6MAytNIaa6ZLOZ14TaucRV
-wWSmgkRxU1fD/rjuqzbMkRxkNYTY0qmYHVgTsFuj6z59enWFh8eiuSmqFgb9wLP/
-NRx9VLles6FnQXdVkFcLLD66qqiMjCqsTmvEgnrgvW0ir7/aFZuaKSM8Tx1JNXzu
-DLy2UYlXHB5tSUXNnaByCD+Hy2Yl7bINP3lFZWW2RJMrWyS6/LjfMTWPxAzCQhCw
-2USPrtscGHOQtRRnlhSz
-=KHzS
+iQIcBAEBCgAGBQJOdR+aAAoJEEb+UGWnxTyH6GgQALjUwrGzu8BIh4vqIwsla4rn
+ZEA4EWejTgXYrC36N04Wm27/2goG7pQIfCR6PSjpKHIBT0qmd/0aripz3vYKD73z
+Ra8Qj+OJIWxrbzt9LXEqOqqH7/74PKcXXGuY9ykE4k5/OItAK5ZWiMVLKdE5e1JI
+6CTrTUc8NQVmi01n9MM48mX706EzpjeLrqTju6qW2ERBLKGYVc3jJPRR/qb7LHHY
+fr0r82clLkfushcMj3NrXs0z+RtzGSpsMdiTAiTpVysuIbLfxMr4LGdNDHz2KBs5
+6AfYzvYNyQv0C/LQHvaVc3tSRpUw5xheSm6deFuSQqmoR8xv9F5xAIsBl/tayIQ2
+NqheUO7EsAXFEGVMN03J1lxTdJhfdBNxsD0XgnUh0erYbO+ZIk2VcZtTO3c63aUd
+LQbn4EFZQ+5KeefuE/llsp5iKasGt86qZxbU4t38VSQPOu9KDUVxkfJ++AeHuFDG
+AOMskhLnHj6lhzWwInjShRS6gn19z65iyKIP80tXRtvyTKIU7Fg3asWSeglOBE5F
+jmGc0EL8g9fyKjPeXoaJTJInaDyr4OF75rwHfLU4j9Y2s+RV0fc34timo/LvvlkO
+s2DWoHYPieBjXqJygUrb26CQsUGFjCaLn0/RT5q1x+jGG0Y9aNwnSX2v8MkVv8b0
+AiCHqER4M2JJDFtceNfv
+=555t
-----END PGP SIGNATURE-----
diff --git a/www-misc/zoneminder/files/1.25.0/Makefile.am.2.patch b/www-misc/zoneminder/files/1.25.0/Makefile.am.2.patch
new file mode 100644
index 0000000..0434fb9
--- /dev/null
+++ b/www-misc/zoneminder/files/1.25.0/Makefile.am.2.patch
@@ -0,0 +1,23 @@
+diff -ruN ZoneMinder-1.25.0.orig/web/Makefile.am ZoneMinder-1.25.0/web/Makefile.am
+--- ZoneMinder-1.25.0.orig/web/Makefile.am 2011-05-15 23:15:23.000000000 +0200
++++ ZoneMinder-1.25.0/web/Makefile.am 2011-09-18 00:24:00.428778534 +0200
+@@ -22,13 +22,12 @@
+
+ # Yes, you are correct. This is a HACK!
+ install-data-hook:
+- ( cd $(DESTDIR)$(webdir); chown $(webuser):$(webgroup) $(dist_web_DATA) )
+- ( cd $(DESTDIR)$(webdir); chown -R $(webuser):$(webgroup) $(SUBDIRS) )
+- @-( cd $(DESTDIR)$(webdir); if ! test -e events; then mkdir events; fi; chown $(webuser):$(webgroup) events; chmod u+w events )
+- @-( cd $(DESTDIR)$(webdir); if ! test -e images; then mkdir images; fi; chown $(webuser):$(webgroup) images; chmod u+w images )
+- @-( cd $(DESTDIR)$(webdir); if ! test -e sounds; then mkdir sounds; fi; chown $(webuser):$(webgroup) sounds; chmod u+w sounds )
+- @-( cd $(DESTDIR)$(webdir); if ! test -e tools; then mkdir tools; fi; chown $(webuser):$(webgroup) tools; chmod u+w tools )
+- @-( cd $(DESTDIR)$(webdir); if ! test -e temp; then mkdir temp; fi; chown $(webuser):$(webgroup) temp; chmod u+w temp )
++ ( cd $(DESTDIR)$(webdir) )
++ @-( cd $(DESTDIR)$(webdir); if ! test -e events; then mkdir events; fi )
++ @-( cd $(DESTDIR)$(webdir); if ! test -e images; then mkdir images; fi )
++ @-( cd $(DESTDIR)$(webdir); if ! test -e sounds; then mkdir sounds; fi )
++ @-( cd $(DESTDIR)$(webdir); if ! test -e tools; then mkdir tools; fi )
++ @-( cd $(DESTDIR)$(webdir); if ! test -e temp; then mkdir temp; fi )
+
+ uninstall-hook:
+ @-( cd $(DESTDIR)$(webdir); rm -rf $(SUBDIRS) )
diff --git a/www-misc/zoneminder/files/1.25.0/Makefile.am.patch b/www-misc/zoneminder/files/1.25.0/Makefile.am.patch
index bba895e..f8adce6 100644
--- a/www-misc/zoneminder/files/1.25.0/Makefile.am.patch
+++ b/www-misc/zoneminder/files/1.25.0/Makefile.am.patch
@@ -12,7 +12,7 @@ diff -ruN ZoneMinder-1.25.0-0-vanilla/Makefile.am ZoneMinder-1.25.0/Makefile.am
- ( 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 )
- ( 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 )
+ ( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; )
-+ ( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -m 700 -p $(DESTDIR)$(ZM_TMPDIR); )
++ ( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -m 700 -p $(DESTDIR)$(ZM_TMPDIR); fi; )
+ ( if ! test -e $(DESTDIR)$(ZM_LOGDIR); then mkdir -p $(DESTDIR)$(ZM_LOGDIR); fi; )
uninstall-hook:
diff --git a/www-misc/zoneminder/zoneminder-1.25.0.ebuild b/www-misc/zoneminder/zoneminder-1.25.0.ebuild
index ff23382..646197b 100644
--- a/www-misc/zoneminder/zoneminder-1.25.0.ebuild
+++ b/www-misc/zoneminder/zoneminder-1.25.0.ebuild
@@ -54,6 +54,7 @@ S=${WORKDIR}/${MY_PN}-${PV}
PATCHES=(
"${FILESDIR}"/1.25.0/Makefile.am.patch
+ "${FILESDIR}"/1.25.0/Makefile.am.2.patch
"${FILESDIR}"/1.24.2/db_upgrade_script_location.patch
)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-09-17 22:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-01 20:59 [gentoo-commits] dev/dilfridge:master commit in: www-misc/zoneminder/files/1.25.0/, www-misc/zoneminder/ Andreas Hüttel
-- strict thread matches above, loose matches on Subject: below --
2011-09-17 22:30 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