Added a hangcheck timer to noad, to kill it after running 30 minutes.

(Portage version: 2.1.2.7)

4 files changed, 120 insertions, 1 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index 1f83c4592924..7ae094ec18d5 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,12 @@
 # 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.21 2007/04/23 07:19:17 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.22 2007/05/12 15:57:31 zzam Exp $
+
+*noad-0.6.0-r8 (12 May 2007)
+
+  12 May 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/noad-0.6.0-hangcheck.diff, +noad-0.6.0-r8.ebuild:
+  Added a hangcheck timer to noad, to kill it after running 30 minutes.
 
   23 Apr 2007; Matthias Schwarzott <zzam@gentoo.org> noad-0.6.0-r7.ebuild:
   Now really using newconfd, fixing Bug #174266.
diff --git a/media-video/noad/files/digest-noad-0.6.0-r8 b/media-video/noad/files/digest-noad-0.6.0-r8
new file mode 100644
index 000000000000..05e249e57c9d
--- /dev/null
+++ b/media-video/noad/files/digest-noad-0.6.0-r8
@@ -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/noad-0.6.0-hangcheck.diff b/media-video/noad/files/noad-0.6.0-hangcheck.diff
new file mode 100644
index 000000000000..c7383c715450
--- /dev/null
+++ b/media-video/noad/files/noad-0.6.0-hangcheck.diff
@@ -0,0 +1,21 @@
+Nur in noad-0.6.0: confdefs.h.
+Nur in noad-0.6.0: config.log.
+Nur in noad-0.6.0: conftest.cc.
+diff -ru noad-0.6.0-orig/main.cpp noad-0.6.0/main.cpp
+--- noad-0.6.0-orig/main.cpp	2007-05-12 17:28:01.000000000 +0200
++++ noad-0.6.0/main.cpp	2007-05-12 17:31:51.000000000 +0200
+@@ -566,10 +566,14 @@
+     signal(SIGABRT, signal_handler);
+     signal(SIGSEGV, signal_handler);
+     signal(SIGUSR1, signal_handler);
++    signal(SIGALRM, signal_handler);
+     
+     // do cleanup at exit...
+     atexit(cleanUp);
+     
++   
++    // now start alarm timer to kill hanging noad (hardcoded 30min timeout)
++    alarm(30*60);
+     // now do the work..,
+     doNoad(bBefore, recDir);
+ 
diff --git a/media-video/noad/noad-0.6.0-r8.ebuild b/media-video/noad/noad-0.6.0-r8.ebuild
new file mode 100644
index 000000000000..edbac734f978
--- /dev/null
+++ b/media-video/noad/noad-0.6.0-r8.ebuild
@@ -0,0 +1,89 @@
+# 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-r8.ebuild,v 1.1 2007/05/12 15:57:31 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}/${P}-directoryfix.diff
+	epatch ${FILESDIR}/${P}-as-needed.diff
+	epatch ${FILESDIR}/${P}-cflags.diff
+	epatch ${FILESDIR}/${P}-framesize.diff
+	epatch ${FILESDIR}/${P}-delete-while-scanning.diff
+	epatch ${FILESDIR}/${P}-fix-osd.patch
+	epatch ${FILESDIR}/${P}-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 /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."
+}