version bump, tune a bit init script to let it run as non root, bug #157913

Package-Manager: portage-2.1.3.19

7 files changed, 164 insertions, 5 deletions

diff --git a/media-video/motion/ChangeLog b/media-video/motion/ChangeLog
index 6a2b618b7efe..834c7239d500 100644
--- a/media-video/motion/ChangeLog
+++ b/media-video/motion/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/motion
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/motion/ChangeLog,v 1.15 2007/10/19 15:37:54 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/ChangeLog,v 1.16 2007/11/19 21:09:03 aballier Exp $
+
+*motion-3.2.9 (19 Nov 2007)
+
+  19 Nov 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/motion-3.2.9-asneeded.patch, +files/motion.confd,
+  +files/motion.init-r1, +motion-3.2.9.ebuild:
+  version bump, tune a bit init script to let it run as non root, bug #157913
 
   19 Oct 2007; Samuli Suominen <drac@gentoo.org> files/motion.init:
   Add after mysql statement to init script wrt #168777.
diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest
index 9aef4daaec08..a95ec59b62b2 100644
--- a/media-video/motion/Manifest
+++ b/media-video/motion/Manifest
@@ -1,14 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX motion-3.2.4-ffmpeg-compat.patch 570 RMD160 8196c62502a34a67b5a8d3d506786c8261915b2a SHA1 17b70e25088c189ff5c53a12f15387558c39995a SHA256 43a2a19e3497b01c56f507dabe99cb6dd223c806b20120fcc4ffc015825eeb6e
 MD5 c09c2e2392a39287410578002602c14d files/motion-3.2.4-ffmpeg-compat.patch 570
 RMD160 8196c62502a34a67b5a8d3d506786c8261915b2a files/motion-3.2.4-ffmpeg-compat.patch 570
 SHA256 43a2a19e3497b01c56f507dabe99cb6dd223c806b20120fcc4ffc015825eeb6e files/motion-3.2.4-ffmpeg-compat.patch 570
+AUX motion-3.2.9-asneeded.patch 523 RMD160 baff2978ccd2f2caf6259b6d5c0fda41f23d3bb5 SHA1 3d60d68444091c03510cfa3ea6fbd513410d6562 SHA256 9896658b5e4a4026f791071a3f801a250180a08697262228a3cedca019f71dae
+MD5 177b4ec897f9642956a1f675607cacc2 files/motion-3.2.9-asneeded.patch 523
+RMD160 baff2978ccd2f2caf6259b6d5c0fda41f23d3bb5 files/motion-3.2.9-asneeded.patch 523
+SHA256 9896658b5e4a4026f791071a3f801a250180a08697262228a3cedca019f71dae files/motion-3.2.9-asneeded.patch 523
+AUX motion.confd 99 RMD160 e402a6d6873f2267dd1041779b1ef5737305b8f0 SHA1 f66f2f685044e26d5fa61bed8fa47340003c3c24 SHA256 c43ac28bcf76d96b105a03d0d3685688c5f731894bf68a501706681bba76b060
+MD5 4620b6dd57237f29ff6def5f8774f5b0 files/motion.confd 99
+RMD160 e402a6d6873f2267dd1041779b1ef5737305b8f0 files/motion.confd 99
+SHA256 c43ac28bcf76d96b105a03d0d3685688c5f731894bf68a501706681bba76b060 files/motion.confd 99
 AUX motion.init 664 RMD160 3905bf9523552872d40fa90f688e4cd1e66bd422 SHA1 bcf900c4ec4df0e916ce363f87e030d4080cdc8b SHA256 a4b66f9f56e8eda645538a92937deb0031667970afb35d03cd2205c0bfc22fcc
 MD5 71ad849266347393b58c3c0ae999eaf0 files/motion.init 664
 RMD160 3905bf9523552872d40fa90f688e4cd1e66bd422 files/motion.init 664
 SHA256 a4b66f9f56e8eda645538a92937deb0031667970afb35d03cd2205c0bfc22fcc files/motion.init 664
+AUX motion.init-r1 708 RMD160 45f70c3c0d91e9669341e274ff81469a889911ae SHA1 1f73b530683397e04646df01da064ba5a1155095 SHA256 b69a44636c2d091d3e863fcef991b05687001737e5a84a6bb1239234e9e0f857
+MD5 95342a62dd67213bb08356490bcdff27 files/motion.init-r1 708
+RMD160 45f70c3c0d91e9669341e274ff81469a889911ae files/motion.init-r1 708
+SHA256 b69a44636c2d091d3e863fcef991b05687001737e5a84a6bb1239234e9e0f857 files/motion.init-r1 708
 DIST motion-3.2.4.tar.gz 360850 RMD160 09687750161ba37bda6f96d7722d6023b143afd4 SHA1 736b66540b68ed0bf74035bda89c376b29cde14e SHA256 31b862c9bafc3b1682627ca6e93bf8aa4559ec7f0385f0bf6dbceb91afee3530
 DIST motion-3.2.7.tar.gz 370830 RMD160 aaab6b7b993bbf7cc0911b1ea127060a97b81aae SHA1 b0ed252e05f1ff2051df3875dd1a8d0445be45ff SHA256 9ae4e8145b367d9ff0ffd607da597aee3439d23939f3ee28268bc831f71252f2
 DIST motion-3.2.8.tar.gz 394005 RMD160 d110a37ef0f943e07c19a2e43a86577d4a038eb3 SHA1 5b01f10f812cc8bb7878f398ca0f510a737e74da SHA256 8f695660380edf94cdbe7e580a3146bf8c20bcfe3a47643eb9de95e49f691889
+DIST motion-3.2.9.tar.gz 377075 RMD160 47708b7dbd9b63f7709ad3f6f40754eb7d82b134 SHA1 1417529f8c49bdf922caa7d0c746c4a2277fe34a SHA256 de452dc1530d078b29b5a39a909d7483c5b857df3f48c3cef73765a37e98f20c
 EBUILD motion-3.2.4.ebuild 1539 RMD160 2562806a807161403d4d711726a51a03d45903b6 SHA1 e0300e8b938699b2f069d84cd8014d2e77791810 SHA256 8e26eb608c2b552d383737455aaeb6293d61498b62104a5a19972492bd5ac620
 MD5 200529048ae384aed7df5d65fa96ef1d motion-3.2.4.ebuild 1539
 RMD160 2562806a807161403d4d711726a51a03d45903b6 motion-3.2.4.ebuild 1539
@@ -21,10 +37,14 @@ EBUILD motion-3.2.8.ebuild 1450 RMD160 e7152b21ece197d8d444194a9c0657365d3c7a9f
 MD5 b4a960bca733848f0c495c6986b1b090 motion-3.2.8.ebuild 1450
 RMD160 e7152b21ece197d8d444194a9c0657365d3c7a9f motion-3.2.8.ebuild 1450
 SHA256 01893c55f5459eb17d8c4772b27abaa45c23f067910c40485caf0215d2244fb7 motion-3.2.8.ebuild 1450
-MISC ChangeLog 2103 RMD160 2d19cc216c7f52a421c7c431461f517f0bf14f2b SHA1 d519eae7f9a521d6673fe26053f8463606636bb3 SHA256 81c43248e25524565f164c7bce6ea2013403a2f3d63956f49402dc72eea7b6ec
-MD5 cdaf7165c94d25b5682b24ea0939db97 ChangeLog 2103
-RMD160 2d19cc216c7f52a421c7c431461f517f0bf14f2b ChangeLog 2103
-SHA256 81c43248e25524565f164c7bce6ea2013403a2f3d63956f49402dc72eea7b6ec ChangeLog 2103
+EBUILD motion-3.2.9.ebuild 2001 RMD160 2316403301331aa7635196f73d7b3d85da396640 SHA1 b50220942da857712230009fbc83e4ddbb0776c6 SHA256 dfe59df310065b1959ce8d32a36086ecfb3eb60668046c7114c30084cb1876eb
+MD5 2dc622fabc3aa882d2480c58b5f9d173 motion-3.2.9.ebuild 2001
+RMD160 2316403301331aa7635196f73d7b3d85da396640 motion-3.2.9.ebuild 2001
+SHA256 dfe59df310065b1959ce8d32a36086ecfb3eb60668046c7114c30084cb1876eb motion-3.2.9.ebuild 2001
+MISC ChangeLog 2373 RMD160 248776abb01ddf4d418a50170b09b4330402c642 SHA1 40b37ad6117e5277c37811f71af066026b98749e SHA256 510ce8dd71955611ea10b283a21b4ebb7f24fc21d796736f2a46754fc0b4facd
+MD5 5f9052a22f3a540ece71323ce6651986 ChangeLog 2373
+RMD160 248776abb01ddf4d418a50170b09b4330402c642 ChangeLog 2373
+SHA256 510ce8dd71955611ea10b283a21b4ebb7f24fc21d796736f2a46754fc0b4facd ChangeLog 2373
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
@@ -38,3 +58,13 @@ SHA256 bb6f1f233864dbe3ce2601e4be0a03dabdcef3253fae699f9149be0fed266f72 files/di
 MD5 e8361358a5fa73de9394b57c3592c24e files/digest-motion-3.2.8 238
 RMD160 d6a78da7c51810dbaf287044519a995aedb9ed3b files/digest-motion-3.2.8 238
 SHA256 01f61eeb6b8b87458e22a4b85943c658d3b4ce67dd4fad3cd98a5d9e50812ebf files/digest-motion-3.2.8 238
+MD5 c5dc501c5e3f79ed12ddee0138c7b8eb files/digest-motion-3.2.9 238
+RMD160 b2d0bf86bf37f8eaff145f41c2e5d7825eae3cad files/digest-motion-3.2.9 238
+SHA256 80ae571ced4c932ebadf25de5e91a8f9a5f37dbe007bb790baa82f13f86fabed files/digest-motion-3.2.9 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD4DBQFHQfuavFcC4BYPU0oRApn0AJ4++3+FLa73dWn853MR4aoLNlvlZwCY+5yS
+EvL5inrmpKlX0f0ul0rkxg==
+=m9rz
+-----END PGP SIGNATURE-----
diff --git a/media-video/motion/files/digest-motion-3.2.9 b/media-video/motion/files/digest-motion-3.2.9
new file mode 100644
index 000000000000..16874f8b2828
--- /dev/null
+++ b/media-video/motion/files/digest-motion-3.2.9
@@ -0,0 +1,3 @@
+MD5 6003011b126c9b17e23e085e7fba6536 motion-3.2.9.tar.gz 377075
+RMD160 47708b7dbd9b63f7709ad3f6f40754eb7d82b134 motion-3.2.9.tar.gz 377075
+SHA256 de452dc1530d078b29b5a39a909d7483c5b857df3f48c3cef73765a37e98f20c motion-3.2.9.tar.gz 377075
diff --git a/media-video/motion/files/motion-3.2.9-asneeded.patch b/media-video/motion/files/motion-3.2.9-asneeded.patch
new file mode 100644
index 000000000000..5ba12490251f
--- /dev/null
+++ b/media-video/motion/files/motion-3.2.9-asneeded.patch
@@ -0,0 +1,13 @@
+Index: motion-3.2.9/configure
+===================================================================
+--- motion-3.2.9.orig/configure
++++ motion-3.2.9/configure
+@@ -4064,7 +4064,7 @@ fi
+ echo "${ECHO_T}$ac_cv_lib_lavjpeg_decode_jpeg_raw" >&6; }
+ if test $ac_cv_lib_lavjpeg_decode_jpeg_raw = yes; then
+ 
+-                TEMP_LDFLAGS="$TEMP_LDFLAGS -lmjpegutils -llavjpeg"
++                TEMP_LIBS="$TEMP_LIBS -lmjpegutils -llavjpeg"
+                 MJPEG_SUPPORT="yes"
+                 TEMP_CFLAGS="$TEMP_CFLAGS -DMJPEGT"
+ 
diff --git a/media-video/motion/files/motion.confd b/media-video/motion/files/motion.confd
new file mode 100644
index 000000000000..f79c97aee968
--- /dev/null
+++ b/media-video/motion/files/motion.confd
@@ -0,0 +1,4 @@
+# Set the user and group under which motion will be ran
+
+MOTION_USER="motion"
+MOTION_GROUP="video"
diff --git a/media-video/motion/files/motion.init-r1 b/media-video/motion/files/motion.init-r1
new file mode 100644
index 000000000000..70263988d082
--- /dev/null
+++ b/media-video/motion/files/motion.init-r1
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/files/motion.init-r1,v 1.1 2007/11/19 21:09:03 aballier Exp $
+
+opts="${opts} reload"
+
+depend() {
+	need modules
+	after mysql
+}
+
+start() {
+	ebegin "Starting motion detection"
+	start-stop-daemon --start -c ${MOTION_USER} -g ${MOTION_GROUP} --quiet --exec /usr/bin/motion
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping motion detection"
+	start-stop-daemon --stop --quiet --exec /usr/bin/motion
+	eend $?
+}
+
+reload() {
+	ebegin "Reloading motion detection configuration"
+	start-stop-daemon --stop --signal HUP --exec /usr/bin/motion
+	eend $?
+}
diff --git a/media-video/motion/motion-3.2.9.ebuild b/media-video/motion/motion-3.2.9.ebuild
new file mode 100644
index 000000000000..88bd55f9b576
--- /dev/null
+++ b/media-video/motion/motion-3.2.9.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/motion-3.2.9.ebuild,v 1.1 2007/11/19 21:09:03 aballier Exp $
+
+inherit eutils
+
+DESCRIPTION="Motion is a video motion detector with tracking-support for webcams."
+HOMEPAGE="http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE="ffmpeg mysql postgres v4l"
+
+DEPEND="sys-libs/zlib
+	media-libs/jpeg
+	media-video/mjpegtools
+	ffmpeg? ( media-video/ffmpeg )
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )"
+
+pkg_setup() {
+	enewuser motion -1 -1 -1 "video" || die "failed to create motion user"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+}
+
+src_compile() {
+	econf --without-optimizecpu \
+		$(use_with v4l) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with ffmpeg)
+
+	emake || die "emake failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed."
+
+	# Install init script.
+	newinitd "${FILESDIR}"/motion.init-r1 motion
+	newconfd "${FILESDIR}"/motion.confd motion
+
+	# Create correct dir for motion.pid
+	dodir /var/run/motion
+	fowners motion:video /var/run/motion
+	fperms 750 /var/run/motion
+	keepdir /var/run/motion
+
+	# Rename configuration file.
+	mv "${D}"/etc/motion-dist.conf "${D}"/etc/motion.conf
+
+	# Tell it to use a pid file where motion user has the rights to write to
+	sed -i -e "s:motion.pid:motion/\0:" "${D}/etc/motion.conf"
+
+	# Remove dummy documentation and install it using ebuild functions.
+	rm -rf "${D}"/usr/share/doc/${P}
+	dodoc CHANGELOG CODE_STANDARD CREDITS FAQ README README.FreeBSD *.conf
+	dohtml *.html
+}
+
+pkg_postinst() {
+	elog "You need to setup /etc/motion.conf before running"
+	elog "motion for the first time. You can install motion"
+	elog "detection as a service, use:"
+	elog "rc-update add motion default"
+}