Fixing segfault if called with 'tlf -n' patch thanks to Thomas Beierlein <tb@forth-ev.de> bug 287640

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 93 insertions, 3 deletions

diff --git a/media-radio/tlf/ChangeLog b/media-radio/tlf/ChangeLog
index ed9e1529403e..4a7578a4e66e 100644
--- a/media-radio/tlf/ChangeLog
+++ b/media-radio/tlf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-radio/tlf
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/tlf/ChangeLog,v 1.16 2008/12/05 10:06:21 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-radio/tlf/ChangeLog,v 1.17 2009/10/08 16:22:32 vostorga Exp $
+
+*tlf-0.9.31.2-r1 (08 Oct 2009)
+
+  08 Oct 2009; Víctor Ostorga <vostorga@gentoo.org>
+  +tlf-0.9.31.2-r1.ebuild, +files/tlf-0.9.31.2-segfault-fix.patch:
+  Fixing segfault if called with 'tlf -n' patch thanks to Thomas Beierlein
+  <tb@forth-ev.de> bug 287640
 
   05 Dec 2008; Raúl Porcel <armin76@gentoo.org> tlf-0.9.31.2.ebuild:
   x86 stable wrt #249491
diff --git a/media-radio/tlf/Manifest b/media-radio/tlf/Manifest
index f9251855feed..5ebb20031c1b 100644
--- a/media-radio/tlf/Manifest
+++ b/media-radio/tlf/Manifest
@@ -1,4 +1,6 @@
+AUX tlf-0.9.31.2-segfault-fix.patch 1183 RMD160 92598c2b08d0dae567d1a6fe0a2b32c916c3732d SHA1 da2a5e896c27f51740f6721fb03c3be23feda0bc SHA256 137c476584eb3b35b10bbbfbe5ff18a000baac5db3d83d3da501f8ff79f5c478
 DIST tlf-0.9.31-2.tar.gz 606427 RMD160 654912f080e06e64d53f4e4313db79d19941dc63 SHA1 12bad9ee27810dc17bc49f52b79a0124150ef964 SHA256 6d6c323e3124df5ea1b62b07555fcaf5388fef14b938014aa150d582d4e6d6b0
+EBUILD tlf-0.9.31.2-r1.ebuild 1059 RMD160 7d5b3f288c82a5dea1904140b7fa442f6cec68b4 SHA1 9737dbcba636567342ea8ba54f87cda0270e02c2 SHA256 1e717ed1a420614e860384236ca7b05309bf78f334bfc7b2eb9db324ca0b7e66
 EBUILD tlf-0.9.31.2.ebuild 959 RMD160 547e5b1d99c8a201598dd339105c96d1853d6e40 SHA1 436823ef26bf857378d72f1ebb3ab51a0b22f3de SHA256 7a3e1b0f9f22ea52f035fac14971f2ec11415b1c68c60329b4cbc89729ca0e4f
-MISC ChangeLog 4376 RMD160 be34b07ed01f600a787445d06b708a68a67655a4 SHA1 6f8ee2e5948c53ff749c034cf4da770854fe3044 SHA256 b241084f0decc7d09f5f33e07352ff248ee67f9fe719703c4f286e03949179ae
+MISC ChangeLog 4635 RMD160 24f305e8e2d3fad34e19d1b083dae821266e6acc SHA1 900562562e6eeaffe55367f40ec4354315030cc3 SHA256 f36bfed90878d7a80877d0d5f4a3f1dd359fea8f1760811622f18514763286ce
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
diff --git a/media-radio/tlf/files/tlf-0.9.31.2-segfault-fix.patch b/media-radio/tlf/files/tlf-0.9.31.2-segfault-fix.patch
new file mode 100644
index 000000000000..34cb90fa4a8f
--- /dev/null
+++ b/media-radio/tlf/files/tlf-0.9.31.2-segfault-fix.patch
@@ -0,0 +1,39 @@
+--- src/cluster_bg.c.orig	2009-10-03 09:14:28.000000000 +0200
++++ src/cluster_bg.c	2009-10-02 08:25:40.000000000 +0200
+@@ -463,7 +463,10 @@
+ for (j=15; j < 23; j++)
+ 	mvprintw(j,4, "                           ");
+ 
+-if (cluster == SPOTS) linepos = i - 8;
++if (cluster == SPOTS){
++	linepos = i - 8;
++	if (linepos < 0) linepos = 0;
++}
+ else linepos = 0;
+ 
+ 
+--- src/clear_display.c.orig	2007-12-18 16:08:05.000000000 +0100
++++ src/clear_display.c	2009-10-06 07:25:30.000000000 +0200
+@@ -100,10 +100,7 @@
+  else
+ 	strftime(time_buf, 60, "DIG %d-%b-%y %H:%M ",  time_ptr);
+ 
+-strncat (month, time_buf + 2, 2);      /* month for muf calc */
+-m = atoi ( month);
+-if (m == 0)
+-	m++;
++	m = time_ptr->tm_mon;		/* month for muf calc */
+ 	
+ mvprintw(12, 3,time_buf);
+ 
+--- src/displayit.c.orig	2009-10-06 16:27:22.000000000 +0200
++++ src/displayit.c	2009-10-06 16:45:31.000000000 +0200
+@@ -39,7 +39,7 @@
+ 		strncat(term2buf, termbuf,  strlen(termbuf) - 1  );
+ 		strncat(term2buf, backgrnd_str, 81 - strlen(termbuf));   /* fill with blanks */
+ 
+-		strcat(term2buf, "\n");
++		term2buf[80] = '\0';
+ 		strcpy(terminal1, terminal2);
+ 		strcpy(terminal2, terminal3);
+ 		strcpy(terminal3, terminal4);
diff --git a/media-radio/tlf/tlf-0.9.31.2-r1.ebuild b/media-radio/tlf/tlf-0.9.31.2-r1.ebuild
new file mode 100644
index 000000000000..69ceebf23e06
--- /dev/null
+++ b/media-radio/tlf/tlf-0.9.31.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-radio/tlf/tlf-0.9.31.2-r1.ebuild,v 1.1 2009/10/08 16:22:32 vostorga Exp $
+
+inherit eutils flag-o-matic versionator multilib
+
+MY_PV=$(replace_version_separator 3 '-')
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Console-mode amateur radio contest logger"
+HOMEPAGE="http://home.iae.nl/users/reinc/TLF-0.2.html"
+SRC_URI="http://sharon.esrac.ele.tue.nl/pub/linux/ham/tlf/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="sys-libs/ncurses
+	media-libs/hamlib"
+DEPEND="${RDEPEND}
+	sys-apps/gawk"
+
+S=${WORKDIR}/${PN}-$(get_version_component_range 1-3)
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-segfault-fix.patch
+}
+
+src_compile() {
+	append-flags -L/usr/$(get_libdir)/hamlib
+	econf --enable-hamlib
+	emake || die "emake failed."
+}
+
+src_install() {
+	einstall || die "einstall failed."
+	rm -fR "${D}"/usr/share/${PN}/doc
+	dodoc AUTHORS ChangeLog NEWS doc/README
+}