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

Package-Manager: portage-2.1.2.7

5 files changed, 139 insertions, 9 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/Manifest b/media-video/noad/Manifest
index 7af29e0ca170..d00d3bf0bdf6 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -41,15 +41,23 @@ AUX noad-0.6.0-framesize.diff 414 RMD160 187c4be6c276f878b3e64ad484ee6cb19d7dc3a
 MD5 4c7b14d97e7d4c423e169168ce55d265 files/noad-0.6.0-framesize.diff 414
 RMD160 187c4be6c276f878b3e64ad484ee6cb19d7dc3ad files/noad-0.6.0-framesize.diff 414
 SHA256 f6b7769ef62f5c00de9acb9d5e20fba09c2f745dfb2872405b6780411452eb9f files/noad-0.6.0-framesize.diff 414
+AUX noad-0.6.0-hangcheck.diff 671 RMD160 be58e9ef938381c532fdbe738c3fe3300195e555 SHA1 6136620264761a91bb1f528f972bf9b2ba72618e SHA256 5c671cfff0c41ce2c2a7c757a0d2964341c0d6f9374574ded8c010cceb93ce6f
+MD5 988692a55b0b2345b763a2b66ab00c78 files/noad-0.6.0-hangcheck.diff 671
+RMD160 be58e9ef938381c532fdbe738c3fe3300195e555 files/noad-0.6.0-hangcheck.diff 671
+SHA256 5c671cfff0c41ce2c2a7c757a0d2964341c0d6f9374574ded8c010cceb93ce6f files/noad-0.6.0-hangcheck.diff 671
 DIST noad-0.6.0.tar.bz2 151369 RMD160 762c8efeb89d681a77d83d0df70668b62a7057dd SHA1 21ade875f92b5f3a24456fbf6897634966bb0286 SHA256 f473f0137fa9ba8f7a736d9ca019fe5491e1744b17b54a1bdbfc23a9c8001183
 EBUILD noad-0.6.0-r7.ebuild 2076 RMD160 24ce14c95c1fb50e0fa0826710e114ab6d5df570 SHA1 f9667d2b32a6de5830bab693ba55d7fa133f929d SHA256 eb8a3b0e74488225369bf702fcae405a0220d9a27a1f62c0820b36ba7b76505a
 MD5 74569dd8bb0b61f754801ffa33d3a1eb noad-0.6.0-r7.ebuild 2076
 RMD160 24ce14c95c1fb50e0fa0826710e114ab6d5df570 noad-0.6.0-r7.ebuild 2076
 SHA256 eb8a3b0e74488225369bf702fcae405a0220d9a27a1f62c0820b36ba7b76505a noad-0.6.0-r7.ebuild 2076
-MISC ChangeLog 4727 RMD160 b36c53881f317e5caa35ed7e8885f57a5b439e9f SHA1 2823d6ba334ff15ddf2a21349e0aee498011afd7 SHA256 f26669627d6d1ceb821266edc0b0db7422fc5ed3f9f839f524934c7793203dae
-MD5 57ae6f2a0dd185a6d6b5803a9a6e6eb0 ChangeLog 4727
-RMD160 b36c53881f317e5caa35ed7e8885f57a5b439e9f ChangeLog 4727
-SHA256 f26669627d6d1ceb821266edc0b0db7422fc5ed3f9f839f524934c7793203dae ChangeLog 4727
+EBUILD noad-0.6.0-r8.ebuild 2218 RMD160 411a8b68934210588dedfadb577816b1d120b3a7 SHA1 c713338648337c162704fe3c96915a8c3b006298 SHA256 2c44d37566694bccfaf19b06dcb05d67f01f1d4bf46dd9f1d8b453bb87f68878
+MD5 31bd78216f144f5dee1d43cb2e82fdc1 noad-0.6.0-r8.ebuild 2218
+RMD160 411a8b68934210588dedfadb577816b1d120b3a7 noad-0.6.0-r8.ebuild 2218
+SHA256 2c44d37566694bccfaf19b06dcb05d67f01f1d4bf46dd9f1d8b453bb87f68878 noad-0.6.0-r8.ebuild 2218
+MISC ChangeLog 4942 RMD160 76dd306fa4bcbe1ef1d3c2459e91143325ef7931 SHA1 481b9f5992a92689848684c433d1e4f7dc458358 SHA256 91b22672c68fe106c85ba400f058d96e32ad5aadf41469a9c0e426649cea74cb
+MD5 77d7f2b135042e380fd589fac3ca77fc ChangeLog 4942
+RMD160 76dd306fa4bcbe1ef1d3c2459e91143325ef7931 ChangeLog 4942
+SHA256 91b22672c68fe106c85ba400f058d96e32ad5aadf41469a9c0e426649cea74cb ChangeLog 4942
 MISC metadata.xml 345 RMD160 40fa5fcd3946fb26c10efadbe084eb5f56607153 SHA1 01fde850e9581b6a2ccdb95b24d90a1a0511417f SHA256 a6ecd52a0597c34de4d3aa2dd428d3fcbc760e35ef9daa31d6c2d911d55bead4
 MD5 0dac6cdf92af4c49732fb6ac660b2132 metadata.xml 345
 RMD160 40fa5fcd3946fb26c10efadbe084eb5f56607153 metadata.xml 345
@@ -57,10 +65,13 @@ SHA256 a6ecd52a0597c34de4d3aa2dd428d3fcbc760e35ef9daa31d6c2d911d55bead4 metadata
 MD5 d481d5871b1b6a8779050d5a7baeb51e files/digest-noad-0.6.0-r7 235
 RMD160 e1b3720b311c9cafd641d84299b3af913c8d1984 files/digest-noad-0.6.0-r7 235
 SHA256 57903a89cf74860cf7d8e58b307d50def06a591c47a6b947506fe1fef60791c7 files/digest-noad-0.6.0-r7 235
+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
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGLF37t2vP6XvVdOcRAsY0AKDNEPOAfnnOpfNsC/mG3Qz8EO2bQgCdHGOM
-l5riIW8zDMvrqo4AUF4GlP0=
-=djFX
+iD8DBQFGRePyt2vP6XvVdOcRAkXoAKCU/nzxQrx6JtgtNBpTu3HR+EqxsgCffRXI
+WPGVfiqEogL55JkE2xp/wu4=
+=RtuY
 -----END PGP SIGNATURE-----
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."
+}