From nobody@FreeBSD.org  Thu Mar 14 02:54:26 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 95D83EF3
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 14 Mar 2013 02:54:26 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 6E6D7D38
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 14 Mar 2013 02:54:26 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r2E2sQHB054464
	for <freebsd-gnats-submit@FreeBSD.org>; Thu, 14 Mar 2013 02:54:26 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r2E2sQxE054463;
	Thu, 14 Mar 2013 02:54:26 GMT
	(envelope-from nobody)
Message-Id: <201303140254.r2E2sQxE054463@red.freebsd.org>
Date: Thu, 14 Mar 2013 02:54:26 GMT
From: Pedro Giffuni <giffunip@tutopia.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update emulators/x48
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         176935
>Category:       ports
>Synopsis:       Update emulators/x48
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    danfe
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Mar 14 03:00:00 UTC 2013
>Closed-Date:    Fri Apr 19 04:39:30 UTC 2013
>Last-Modified:  Fri Apr 19 04:40:00 UTC 2013
>Originator:     Pedro Giffuni
>Release:        9.1-STABLE
>Organization:
>Environment:
FreeBSD pcbsd-3938 9.1-STABLE FreeBSD 9.1-STABLE #0 r248173: Mon Mar 11 15:53:49 COT 2013     pfg@pcbsd-3938:/usr/src/sys/amd64/compile/DELL  amd64

>Description:
Include a couple of fixes from upstream:

- Fix timer bug causing bogus idle poweroffs while typing
  or immediately after turning on.
- Call to strcpy causes buffer overflow.
>How-To-Repeat:
While here, note that berlios seems to be now part of sourceforge
but port.sites.mk doesn't know about it.
>Fix:


Patch attached with submission follows:

Index: x48/files/patch-src+debugger.c
===================================================================
--- x48/files/patch-src+debugger.c	(revision 0)
+++ x48/files/patch-src+debugger.c	(working copy)
@@ -0,0 +1,13 @@
+--- src/debugger.c	2011/08/10 05:36:10	57
++++ src/debugger.c	2011/08/10 05:38:58	58
+@@ -1933,8 +1933,8 @@
+ 	      free (old_line);
+               old_line = (char *) 0;
+ 	    }
+-	  cl = strcpy ((char *) malloc (strlen (rl)), rl);
+-	  old_line = strcpy ((char *) malloc (strlen (rl)), rl);
++	  cl = strdup (rl);
++	  old_line = strdup (rl); 
+ #ifdef HAVE_READLINE
+ 	  add_history (rl);
+ #endif
Index: x48/files/patch-src+timer.c
===================================================================
--- x48/files/patch-src+timer.c	(revision 0)
+++ x48/files/patch-src+timer.c	(working copy)
@@ -0,0 +1,11 @@
+--- src/timer.c	2011/08/10 02:29:47	51
++++ src/timer.c	2011/08/10 02:32:11	52
+@@ -509,7 +509,7 @@
+     {
+       set_0_time += adj_time;
+       time_offset += adj_time;
+-      access_time - adj_time;
++      access_time -= adj_time;
+   
+ #ifdef DEBUG_TIMER_ADJUST
+       fprintf(stderr, "Time adjusted by ");


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->danfe 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Mar 14 03:00:08 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176935 

From: "Pedro F. Giffuni" <giffunip@tutopia.com>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc: Alexey Dokuchaev <danfe@FreeBSD.org>
Subject: Re: ports/176935: Update emulators/x48
Date: Thu, 14 Mar 2013 09:31:45 -0700 (PDT)

 ---309136488-1516195801-1363278705=:53625
 Content-Type: text/plain; charset=utf-8
 Content-Transfer-Encoding: quoted-printable
 
 Attached is a new patch that fixes issues finding paths since the upstream =
 change from imake to automake.
 ---309136488-1516195801-1363278705=:53625
 Content-Type: text/plain; name="patch-x48.txt"
 Content-Transfer-Encoding: base64
 Content-Disposition: attachment; filename="patch-x48.txt"
 
 SW5kZXg6IHg0OC9NYWtlZmlsZQo9PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t
 LSB4NDgvTWFrZWZpbGUJKHJldmlzaW9uIDMxNDEyNSkKKysrIHg0OC9NYWtl
 ZmlsZQkod29ya2luZyBjb3B5KQpAQCAtMzcsMTMgKzM3LDEyIEBACiBwb3N0
 LXBhdGNoOgogIyBQcmVmZXIgR1ggUmV2aXNpb24gUiBST00gYnkgZGVmYXVs
 dAogCUAke1JFSU5QTEFDRV9DTUR9IC1lICdzK3JvbVwuZHVtcCske0RBVEFE
 SVJ9L2d4cm9tLXIrJyBcCi0JCSR7V1JLU1JDfS9zcmMvWDQ4LmFkCisJCSR7
 V1JLU1JDfS9zcmMvWDQ4LmFkLmgKIAogZG8taW5zdGFsbDoKIC5mb3IgcCBp
 biB4NDggZHVtcDJyb20gY2hlY2tyb20gbWtjYXJkCiAJJHtJTlNUQUxMX1BS
 T0dSQU19ICR7V1JLU1JDfS9zcmMvJHtwfSAke1BSRUZJWH0vYmluCiAuZW5k
 Zm9yCi0JJHtJTlNUQUxMX0RBVEF9ICR7V1JLU1JDfS9zcmMvWDQ4LmFkICR7
 UFJFRklYfS9saWIvWDExL2FwcC1kZWZhdWx0cy9YNDgKIAlAJHtNS0RJUn0g
 JHtEQVRBRElSfQogCSR7SU5TVEFMTF9EQVRBfSAke1dSS1NSQ30vPz9yb20t
 PyAke0RBVEFESVJ9CiAuaWYgIWRlZmluZWQoTk9QT1JURE9DUykKSW5kZXg6
 IHg0OC9maWxlcy9wYXRjaC1zcmMrWDQ4LmFkLmgKPT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PQotLS0geDQ4L2ZpbGVzL3BhdGNoLXNyYytYNDguYWQuaAkocmV2
 aXNpb24gMCkKKysrIHg0OC9maWxlcy9wYXRjaC1zcmMrWDQ4LmFkLmgJKHdv
 cmtpbmcgY29weSkKQEAgLTAsMCArMSwxMyBAQAorLS0tIHNyYy9YNDguYWQu
 aC5vcmlnCTIwMTMtMDMtMTQgMTE6MTY6NTkuMDAwMDAwMDAwIC0wNTAwCisr
 Kysgc3JjL1g0OC5hZC5oCTIwMTMtMDMtMTQgMTE6MTc6MzMuMDAwMDAwMDAw
 IC0wNTAwCitAQCAtMTQsOCArMTQsOCBAQAorICIqcHJpbnRDb3B5cmlnaHQ6
 CUZhbHNlIiwKKyAiKnByaW50V2FycmFudHk6CQlGYWxzZSIsCisgIip1c2VU
 ZXJtaW5hbDoJCVRydWUiLAorLSIqdXNlU2VyaWFsOgkJRmFsc2UiLAorLSIq
 c2VyaWFsTGluZToJCS9kZXYvdHR5UzAiLAorKyIqdXNlU2VyaWFsOgkJVHJ1
 ZSIsCisrIipzZXJpYWxMaW5lOgkJL2Rldi9jdWFhMCIsCisgIipjb21wbGV0
 ZUluaXRpYWxpemU6CUZhbHNlIiwKKyAiKnJlc2V0T25TdGFydHVwOglGYWxz
 ZSIsCisgIipyb21GaWxlTmFtZToJCXJvbS5kdW1wIiwKSW5kZXg6IHg0OC9m
 aWxlcy9wYXRjaC1zcmMrZGVidWdnZXIuYwo9PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09Ci0tLSB4NDgvZmlsZXMvcGF0Y2gtc3JjK2RlYnVnZ2VyLmMJKHJldmlz
 aW9uIDApCisrKyB4NDgvZmlsZXMvcGF0Y2gtc3JjK2RlYnVnZ2VyLmMJKHdv
 cmtpbmcgY29weSkKQEAgLTAsMCArMSwxMyBAQAorLS0tIHNyYy9kZWJ1Z2dl
 ci5jCTIwMTEvMDgvMTAgMDU6MzY6MTAJNTcKKysrKyBzcmMvZGVidWdnZXIu
 YwkyMDExLzA4LzEwIDA1OjM4OjU4CTU4CitAQCAtMTkzMyw4ICsxOTMzLDgg
 QEAKKyAJICAgICAgZnJlZSAob2xkX2xpbmUpOworICAgICAgICAgICAgICAg
 b2xkX2xpbmUgPSAoY2hhciAqKSAwOworIAkgICAgfQorLQkgIGNsID0gc3Ry
 Y3B5ICgoY2hhciAqKSBtYWxsb2MgKHN0cmxlbiAocmwpKSwgcmwpOworLQkg
 IG9sZF9saW5lID0gc3RyY3B5ICgoY2hhciAqKSBtYWxsb2MgKHN0cmxlbiAo
 cmwpKSwgcmwpOworKwkgIGNsID0gc3RyZHVwIChybCk7CisrCSAgb2xkX2xp
 bmUgPSBzdHJkdXAgKHJsKTsgCisgI2lmZGVmIEhBVkVfUkVBRExJTkUKKyAJ
 ICBhZGRfaGlzdG9yeSAocmwpOworICNlbmRpZgpJbmRleDogeDQ4L2ZpbGVz
 L3BhdGNoLXNyYyt0aW1lci5jCj09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t
 IHg0OC9maWxlcy9wYXRjaC1zcmMrdGltZXIuYwkocmV2aXNpb24gMCkKKysr
 IHg0OC9maWxlcy9wYXRjaC1zcmMrdGltZXIuYwkod29ya2luZyBjb3B5KQpA
 QCAtMCwwICsxLDExIEBACistLS0gc3JjL3RpbWVyLmMJMjAxMS8wOC8xMCAw
 MjoyOTo0Nwk1MQorKysrIHNyYy90aW1lci5jCTIwMTEvMDgvMTAgMDI6MzI6
 MTEJNTIKK0BAIC01MDksNyArNTA5LDcgQEAKKyAgICAgeworICAgICAgIHNl
 dF8wX3RpbWUgKz0gYWRqX3RpbWU7CisgICAgICAgdGltZV9vZmZzZXQgKz0g
 YWRqX3RpbWU7CistICAgICAgYWNjZXNzX3RpbWUgLSBhZGpfdGltZTsKKysg
 ICAgICBhY2Nlc3NfdGltZSAtPSBhZGpfdGltZTsKKyAgIAorICNpZmRlZiBE
 RUJVR19USU1FUl9BREpVU1QKKyAgICAgICBmcHJpbnRmKHN0ZGVyciwgIlRp
 bWUgYWRqdXN0ZWQgYnkgIik7CkluZGV4OiB4NDgvcGtnLXBsaXN0Cj09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT0KLS0tIHg0OC9wa2ctcGxpc3QJKHJldmlzaW9u
 IDMxNDEyNSkKKysrIHg0OC9wa2ctcGxpc3QJKHdvcmtpbmcgY29weSkKQEAg
 LTIsNyArMiw2IEBACiBiaW4vZHVtcDJyb20KIGJpbi9ta2NhcmQKIGJpbi94
 NDgKLWxpYi9YMTEvYXBwLWRlZmF1bHRzL1g0OAogJSVEQVRBRElSJSUvZ3hy
 b20tcgogJSVEQVRBRElSJSUvc3hyb20tZQogQGRpcnJtICUlREFUQURJUiUl
 Cg==
 
 ---309136488-1516195801-1363278705=:53625--
State-Changed-From-To: open->closed 
State-Changed-By: danfe 
State-Changed-When: Fri Apr 19 04:39:03 UTC 2013 
State-Changed-Why:  
Port was updated, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176935 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/176935: commit references a PR
Date: Fri, 19 Apr 2013 04:38:40 +0000 (UTC)

 Author: danfe
 Date: Fri Apr 19 04:38:32 2013
 New Revision: 316085
 URL: http://svnweb.freebsd.org/changeset/ports/316085
 
 Log:
   - Update to version 0.6.4
   - Tighten Makefile header and COMMENT
   - Register run-time dependency on required fonts
   - NOPORTDOCS -> PORT_OPTIONS:MDOCS
   - Convert trivial patch to sed(1) in-place editing
   
   PR:		ports/176935 (version bump)
   Submitted by:	pfg
   Feature safe:	yes
 
 Deleted:
   head/emulators/x48/files/patch-src+X48.ad
 Modified:
   head/emulators/x48/Makefile
   head/emulators/x48/distinfo
   head/emulators/x48/pkg-plist
 
 Modified: head/emulators/x48/Makefile
 ==============================================================================
 --- head/emulators/x48/Makefile	Fri Apr 19 03:41:39 2013	(r316084)
 +++ head/emulators/x48/Makefile	Fri Apr 19 04:38:32 2013	(r316085)
 @@ -1,52 +1,58 @@
 -# New ports collection makefile for:	x48
 -# Date created:				Thu Oct 24 13:10:59 CDT 1996
 -# Whom:					Eric L. Hernes <erich@FreeBSD.org>
 -#
 +# Created by: Eric L. Hernes <erich@FreeBSD.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	x48
 -PORTVERSION=	0.6.3
 +PORTVERSION=	0.6.4
  CATEGORIES=	emulators math
 -MASTER_SITES=	BERLIOS
 -MASTER_SITE_SUBDIR=	${PORTNAME}
 -DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 -		x48-gxrom-r${EXTRACT_SUFX} x48-sxrom-e${EXTRACT_SUFX}
 +MASTER_SITES=	SF/${PORTNAME}.berlios
 +DISTFILES=	${DISTNAME}${EXTRACT_SUFX} gxrom-r.bz2 sxrom-e.bz2
 +DIST_SUBDIR=	${PORTNAME}
  EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
  
  MAINTAINER=	danfe@FreeBSD.org
 -COMMENT=	An HP48 SX/GX graphic calculator emulator
 +COMMENT=	HP48 SX/GX graphic calculator emulator
  
  LICENSE=	GPLv3
  
 -GNU_CONFIGURE=	yes
 +RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/misc/7x14B-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/font-misc-misc \
 +		${LOCALBASE}/lib/X11/fonts/75dpi/helvR12-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-75dpi
 +
 +USE_BZIP2=	yes
 +USE_AUTOTOOLS=	aclocal autoheader automake autoconf
 +AUTOMAKE_ARGS=	--add-missing --copy -Wno-portability
 +ACLOCAL_ARGS=	# default args (--acdir=...) produce broken configure script
  CPPFLAGS+=	-I${LOCALBASE}/include
  CONFIGURE_ENV=	LIBS=-lutil
  USE_GMAKE=	yes
  USE_XORG=	x11 xext xt
 +NO_WRKSUBDIR=	yes
  
  PORTDOCS=	ChangeLog README
  
 +OPTIONS_DEFINE=	DOCS
 +
 +.include <bsd.port.options.mk>
 +
  post-extract: .SILENT
  # Extract official HP ROM images for GX/SX
 -	cd ${WRKSRC} && ${TAR} -zxf ${DISTDIR}/x48-gxrom-r${EXTRACT_SUFX}
 -	${MV} ${WRKSRC}/.hp48/rom ${WRKSRC}/gxrom-r
 -	cd ${WRKSRC} && ${TAR} -zxf ${DISTDIR}/x48-sxrom-e${EXTRACT_SUFX}
 -	${MV} ${WRKSRC}/.hp48/rom ${WRKSRC}/sxrom-e
 +	${CP} ${_DISTDIR}/gxrom-r.bz2 ${WRKSRC} && ${EXTRACT_CMD} \
 +		-d ${WRKSRC}/gxrom-r.bz2
 +# The latest SX ROM revision is J, but it does not work with x48, so use E
 +	${CP} ${_DISTDIR}/sxrom-e.bz2 ${WRKSRC} && ${EXTRACT_CMD} \
 +		-d ${WRKSRC}/sxrom-e.bz2
  
  post-patch:
 -# Prefer GX Revision R ROM by default
 -	@${REINPLACE_CMD} -e 's+rom\.dump+${DATADIR}/gxrom-r+' \
 -		${WRKSRC}/src/X48.ad
 +# Enable serial communication and prefer GX Revision R ROM by default
 +	@${REINPLACE_CMD} -e '/useSerial/s+False+True+ ; s+ttyS+cuau+ ; \
 +		s+rom\.dump+${DATADIR}/gxrom-r+' ${WRKSRC}/src/X48.ad.h
  
  do-install:
  .for p in x48 dump2rom checkrom mkcard
  	${INSTALL_PROGRAM} ${WRKSRC}/src/${p} ${PREFIX}/bin
  .endfor
 -	${INSTALL_DATA} ${WRKSRC}/src/X48.ad ${PREFIX}/lib/X11/app-defaults/X48
  	@${MKDIR} ${DATADIR}
  	${INSTALL_DATA} ${WRKSRC}/??rom-? ${DATADIR}
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  	@${MKDIR} ${DOCSDIR}
  	${INSTALL_DATA} ${PORTDOCS:S+^+${WRKSRC}/+} ${DOCSDIR}
  .endif
 
 Modified: head/emulators/x48/distinfo
 ==============================================================================
 --- head/emulators/x48/distinfo	Fri Apr 19 03:41:39 2013	(r316084)
 +++ head/emulators/x48/distinfo	Fri Apr 19 04:38:32 2013	(r316085)
 @@ -1,6 +1,6 @@
 -SHA256 (x48-0.6.3.tar.gz) = c765bfa3b059e31ed9034a7c7f1bee102a228fd164dfc555c8d2e6ae342c7638
 -SIZE (x48-0.6.3.tar.gz) = 319892
 -SHA256 (x48-gxrom-r.tar.gz) = 4609111de35ba013fc25f8379f75ef3723a9a72140afe70c00f82d6eda952d8c
 -SIZE (x48-gxrom-r.tar.gz) = 332583
 -SHA256 (x48-sxrom-e.tar.gz) = 5b5585df13b4d41329dc8c9b509e6291786b514cac2915ae935d1f60479dce6b
 -SIZE (x48-sxrom-e.tar.gz) = 189906
 +SHA256 (x48/x48-0.6.4.tar.bz2) = dd42fb3dfde860abb758f8e6d5ccd01845bbf0dcd808b87786eec3ef7091067f
 +SIZE (x48/x48-0.6.4.tar.bz2) = 227991
 +SHA256 (x48/gxrom-r.bz2) = f89eb7bf979e62db53d436e3218b963c693f66c52797218c01d6552f1bbe014f
 +SIZE (x48/gxrom-r.bz2) = 332316
 +SHA256 (x48/sxrom-e.bz2) = b08f7e9108f85f1f54f632ce13f880f7dfebc57866c464ea8d3ad24ad4f89c2e
 +SIZE (x48/sxrom-e.bz2) = 190826
 
 Modified: head/emulators/x48/pkg-plist
 ==============================================================================
 --- head/emulators/x48/pkg-plist	Fri Apr 19 03:41:39 2013	(r316084)
 +++ head/emulators/x48/pkg-plist	Fri Apr 19 04:38:32 2013	(r316085)
 @@ -2,7 +2,6 @@ bin/checkrom
  bin/dump2rom
  bin/mkcard
  bin/x48
 -lib/X11/app-defaults/X48
  %%DATADIR%%/gxrom-r
  %%DATADIR%%/sxrom-e
  @dirrm %%DATADIR%%
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
