Added shutdown hook to check if there are hanging long running noad process and kill them.

Package-Manager: portage-2.1.2.7

5 files changed, 162 insertions, 8 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index 659c688b0384..6cd20c5312d7 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/noad
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.24 2007/05/21 16:56:29 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.25 2007/05/24 07:18:55 zzam Exp $
+
+*noad-0.6.0-r9 (24 May 2007)
+
+  24 May 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/pre-shutdown-15-noad.sh, +noad-0.6.0-r9.ebuild:
+  Added shutdown hook to check if there are hanging long running noad process
+  and kill them.
 
   21 May 2007; Matthias Schwarzott <zzam@gentoo.org>
   -files/noad-0.6.0-as-needed.diff, -files/noad-0.6.0-cflags.diff,
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
index 7b6f49e0ec86..e48ee7bacc44 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -49,6 +49,10 @@ AUX patches-0.6.0/series 101 RMD160 76992b20b7012150a25d690bf86ae78f1f00b5ae SHA
 MD5 0ee9541082540c2aa3e3f3d3fde5d079 files/patches-0.6.0/series 101
 RMD160 76992b20b7012150a25d690bf86ae78f1f00b5ae files/patches-0.6.0/series 101
 SHA256 d0e5e7d0e2a326781a33ecfa2f97e76ad80688de507c7baa3b7bcac8af566575 files/patches-0.6.0/series 101
+AUX pre-shutdown-15-noad.sh 771 RMD160 3b68196b18d4820ebc49cbd1dc517de5dd10c741 SHA1 052504eea27ea04d10dff671df3929b62a404e15 SHA256 c5a711256fc48bf8edd7b28f23ae61aa365370cec9b0470ca1c017a5e36e66c2
+MD5 f78d0723081b03ab7d430ca91a6c68de files/pre-shutdown-15-noad.sh 771
+RMD160 3b68196b18d4820ebc49cbd1dc517de5dd10c741 files/pre-shutdown-15-noad.sh 771
+SHA256 c5a711256fc48bf8edd7b28f23ae61aa365370cec9b0470ca1c017a5e36e66c2 files/pre-shutdown-15-noad.sh 771
 DIST noad-0.6.0.tar.bz2 151369 RMD160 762c8efeb89d681a77d83d0df70668b62a7057dd SHA1 21ade875f92b5f3a24456fbf6897634966bb0286 SHA256 f473f0137fa9ba8f7a736d9ca019fe5491e1744b17b54a1bdbfc23a9c8001183
 EBUILD noad-0.6.0-r7.ebuild 2130 RMD160 421321c8528fa350e3e0ba465297a6583b5b3a98 SHA1 d1453b50c3787e36603e3c681e19ff693ef29cb5 SHA256 5b1cccf56c2728e2b2172405fdb59e0a50fa800a2ae9e895bb41633803a57f60
 MD5 35dfa56718e98f9fe76a08d05d4ff17a noad-0.6.0-r7.ebuild 2130
@@ -58,10 +62,14 @@ EBUILD noad-0.6.0-r8.ebuild 2281 RMD160 98db6c0365ec833f28b31986c71763faa79ecf4c
 MD5 69b070e379630a051dc7c4f87ace7128 noad-0.6.0-r8.ebuild 2281
 RMD160 98db6c0365ec833f28b31986c71763faa79ecf4c noad-0.6.0-r8.ebuild 2281
 SHA256 030ef690556284da100e02158c4fe13dc91b67cc2ca328a9d2fd8e80743caef5 noad-0.6.0-r8.ebuild 2281
-MISC ChangeLog 5784 RMD160 58decf654c19e5bce756d545f61a0fa81b57044b SHA1 bb47a2f7e6c0761617a2acbf327940cca76b9d57 SHA256 d3b046bad41fadca1feae9b88824066af5d50dab6d5dabfa8ea592fe8b2936b7
-MD5 a6cea00bb47ebf5cea111fda4679a70a ChangeLog 5784
-RMD160 58decf654c19e5bce756d545f61a0fa81b57044b ChangeLog 5784
-SHA256 d3b046bad41fadca1feae9b88824066af5d50dab6d5dabfa8ea592fe8b2936b7 ChangeLog 5784
+EBUILD noad-0.6.0-r9.ebuild 2358 RMD160 910801e01da2fc2d26aab03023b953cdc8e8e906 SHA1 3c01a735bf8e43475fea0b485e26540cae62f6af SHA256 17c43ab301bf83fd0638d96f47bc1a99a50f564cffb99089d46683daa60de7e3
+MD5 39f3b1323de02e43dee076ea65a4af5c noad-0.6.0-r9.ebuild 2358
+RMD160 910801e01da2fc2d26aab03023b953cdc8e8e906 noad-0.6.0-r9.ebuild 2358
+SHA256 17c43ab301bf83fd0638d96f47bc1a99a50f564cffb99089d46683daa60de7e3 noad-0.6.0-r9.ebuild 2358
+MISC ChangeLog 6020 RMD160 1bb9618f9ae11732b0db4afbe7ecea1b8f9313cd SHA1 71f7171be2ec31ab279b7521f007ce259b7b673d SHA256 58a0d0c7876df01fda3b19e7fa60f862e0f0e5fd6f5fe7052030e4ed6606fc10
+MD5 81e659bab82ff14a55db0230f36d3546 ChangeLog 6020
+RMD160 1bb9618f9ae11732b0db4afbe7ecea1b8f9313cd ChangeLog 6020
+SHA256 58a0d0c7876df01fda3b19e7fa60f862e0f0e5fd6f5fe7052030e4ed6606fc10 ChangeLog 6020
 MISC metadata.xml 345 RMD160 40fa5fcd3946fb26c10efadbe084eb5f56607153 SHA1 01fde850e9581b6a2ccdb95b24d90a1a0511417f SHA256 a6ecd52a0597c34de4d3aa2dd428d3fcbc760e35ef9daa31d6c2d911d55bead4
 MD5 0dac6cdf92af4c49732fb6ac660b2132 metadata.xml 345
 RMD160 40fa5fcd3946fb26c10efadbe084eb5f56607153 metadata.xml 345
@@ -72,10 +80,13 @@ SHA256 57903a89cf74860cf7d8e58b307d50def06a591c47a6b947506fe1fef60791c7 files/di
 MD5 d481d5871b1b6a8779050d5a7baeb51e files/digest-noad-0.6.0-r8 235
 RMD160 e1b3720b311c9cafd641d84299b3af913c8d1984 files/digest-noad-0.6.0-r8 235
 SHA256 57903a89cf74860cf7d8e58b307d50def06a591c47a6b947506fe1fef60791c7 files/digest-noad-0.6.0-r8 235
+MD5 d481d5871b1b6a8779050d5a7baeb51e files/digest-noad-0.6.0-r9 235
+RMD160 e1b3720b311c9cafd641d84299b3af913c8d1984 files/digest-noad-0.6.0-r9 235
+SHA256 57903a89cf74860cf7d8e58b307d50def06a591c47a6b947506fe1fef60791c7 files/digest-noad-0.6.0-r9 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGUc9Jt2vP6XvVdOcRAgu9AKCBC+ALaFVsZyL/ql6T92iPSncxxACfXURH
-wQkw16TqcqsxbcovsjPWLwA=
-=Yg7f
+iD8DBQFGVTxlt2vP6XvVdOcRAlnTAKCptfma/MVvBQU86i5SwbeHJNquowCdEgaW
+ADNRKLtlSmL+c3Igm78LTms=
+=bkw8
 -----END PGP SIGNATURE-----
diff --git a/media-video/noad/files/digest-noad-0.6.0-r9 b/media-video/noad/files/digest-noad-0.6.0-r9
new file mode 100644
index 000000000000..05e249e57c9d
--- /dev/null
+++ b/media-video/noad/files/digest-noad-0.6.0-r9
@@ -0,0 +1,3 @@
+MD5 62947d5afec56cdb9884535d9813530d noad-0.6.0.tar.bz2 151369
+RMD160 762c8efeb89d681a77d83d0df70668b62a7057dd noad-0.6.0.tar.bz2 151369
+SHA256 f473f0137fa9ba8f7a736d9ca019fe5491e1744b17b54a1bdbfc23a9c8001183 noad-0.6.0.tar.bz2 151369
diff --git a/media-video/noad/files/pre-shutdown-15-noad.sh b/media-video/noad/files/pre-shutdown-15-noad.sh
new file mode 100644
index 000000000000..476741e7bac7
--- /dev/null
+++ b/media-video/noad/files/pre-shutdown-15-noad.sh
@@ -0,0 +1,41 @@
+#
+# pre-shutdown script to abort shutdown in case noad is running
+
+check_runtime() {
+	local PID="$1"
+
+	# Max runtime of 30m = 1800s
+	local NOAD_MAX_TIME=1800
+	local NOW="$(date +%s)"
+	local START="$(stat --format "%Z" /proc/${PID}/)"
+	local DIFF=$(( $NOW - $START ))
+	if [ "${DIFF}" -ge "${NOAD_MAX_TIME}" ]; then
+		kill ${PID}
+		sleep 2
+		kill -9 ${PID}
+		return 0
+	else
+		# There still is a running noad process
+		return 1
+	fi
+}
+
+check_noad() {
+	local PIDOF=pidof
+	local NOAD=/usr/bin/noad
+
+	local PIDS=$(${PIDOF} ${NOAD})
+	local PID
+	local still_running=0
+	for PID in $PIDS; do
+		check_runtime "${PID}"
+		[ "$?" = "1" ] && still_running=1
+	done
+
+	if [ "${still_running}" -gt "0" ]; then
+		# stop shutdown
+		shutdown_abort_can_force "noad is running"
+	fi
+}
+
+check_noad
diff --git a/media-video/noad/noad-0.6.0-r9.ebuild b/media-video/noad/noad-0.6.0-r9.ebuild
new file mode 100644
index 000000000000..9ea80fb1c5f9
--- /dev/null
+++ b/media-video/noad/noad-0.6.0-r9.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.6.0-r9.ebuild,v 1.1 2007/05/24 07:18:55 zzam Exp $
+
+WANT_AUTOMAKE="latest"
+WANT_AUTOCONF="latest"
+
+inherit eutils autotools
+
+DESCRIPTION="Mark commercial Breaks in VDR records"
+HOMEPAGE="http://www.freepgs.com/noad/"
+SRC_URI="http://www.freepgs.com/${PN}/${P}.tar.bz2
+		mirror://vdrfiles/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ffmpeg imagemagick"
+
+DEPEND="media-libs/libmpeg2
+	media-video/vdr
+	ffmpeg? ( >=media-video/ffmpeg-0.4.8 )
+	imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 )"
+RDEPEND=">=media-tv/gentoo-vdr-scripts-0.3.5"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/patches-${PV}/directoryfix.diff
+	epatch ${FILESDIR}/patches-${PV}/as-needed.diff
+	epatch ${FILESDIR}/patches-${PV}/cflags.diff
+	epatch ${FILESDIR}/patches-${PV}/framesize.diff
+	epatch ${FILESDIR}/patches-${PV}/delete-while-scanning.diff
+	epatch ${FILESDIR}/patches-${PV}/fix-osd.patch
+	epatch ${FILESDIR}/patches-${PV}/hangcheck.diff
+
+	rm configure
+	eautoreconf
+}
+
+src_compile() {
+
+	econf \
+		$(use_with ffmpeg) \
+		$(use_with imagemagick magick) \
+		--with-tools \
+		--with-mpeginclude=/usr/include/mpeg2dec
+
+	emake || die "emake faild"
+}
+
+src_install() {
+
+	dobin noad showindex
+	use imagemagick && dobin markpics
+
+	dodoc COPYING README INSTALL
+	# example scripts are installed as dokumentation
+	dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html
+
+	CONF_SOURCE=${FILESDIR}/0.6.0-r7
+	newconfd ${CONF_SOURCE}/confd_vdraddon.noad vdraddon.noad
+
+	insinto /usr/share/vdr/record
+	doins ${CONF_SOURCE}/record-50-noad.sh
+
+	insinto /usr/share/vdr/shutdown
+	doins ${FILESDIR}/pre-shutdown-15-noad.sh
+
+	insinto /etc/vdr/reccmds
+	doins ${CONF_SOURCE}/reccmds.noad.conf
+
+	exeinto /usr/share/vdr/bin
+	doexe ${CONF_SOURCE}/noad-reccmd
+}
+
+pkg_postinst() {
+
+	elog
+	elog "Congratulations, you have just installed noad!,"
+	elog "To integrate noad in VDR you should do this:"
+	elog
+	elog "start and set Parameter in /etc/conf.d/vdraddon.noad"
+	elog
+	elog "Note: You can use here all pararmeters for noad,"
+	elog "please look in the documentation of noad."
+	elog
+	elog "noad now contains a hangcheck timer, to kill noad"
+	elog "if it runs longer than 30 minutes."
+}