From ssedov@mbsd.msk.ru  Mon Sep  4 14:14:22 2006
Return-Path: <ssedov@mbsd.msk.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id DBF0816A4DE
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  4 Sep 2006 14:14:22 +0000 (UTC)
	(envelope-from ssedov@mbsd.msk.ru)
Received: from com1.ht-systems.ru (com1.ht-systems.ru [83.97.104.204])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4A3E743D45
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  4 Sep 2006 14:14:22 +0000 (GMT)
	(envelope-from ssedov@mbsd.msk.ru)
Received: from [80.250.160.136] (helo=fonon.realnet)
	by com1.ht-systems.ru with esmtpa (Exim 4.62)
	(envelope-from <ssedov@mbsd.msk.ru>)
	id 1GKFDR-0006ai-Ck
	for FreeBSD-gnats-submit@freebsd.org; Mon, 04 Sep 2006 18:14:21 +0400
Received: by fonon.realnet (Postfix, from userid 1001)
	id D28B411B6B; Mon,  4 Sep 2006 18:13:45 +0400 (MSD)
Message-Id: <20060904141345.D28B411B6B@fonon.realnet>
Date: Mon,  4 Sep 2006 18:13:45 +0400 (MSD)
From: Stanislav Sedov <ssedov@mbsd.msk.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] devel/safestr: fix amd64 build
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         102846
>Category:       ports
>Synopsis:       [MAINTAINER] devel/safestr: fix amd64 build
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    itetcu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 04 14:20:22 GMT 2006
>Closed-Date:    Mon Sep 04 14:38:39 GMT 2006
>Last-Modified:  Mon Sep 04 14:38:39 GMT 2006
>Originator:     Stanislav Sedov
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
MBSD labs, Inc.
>Environment:
System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Thu Aug 31 10:34:52 MSD 2006
>Description:
- Fix amd64 build

The following files was added:
- files/patch-safefmt.c

Reported by kris@ via pointyhat.

>How-To-Repeat:
>Fix:

--- safestr-1.0.3_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/safestr/Makefile /var/tmp/safestr/Makefile
--- /usr/ports/devel/safestr/Makefile	Mon Aug 14 20:09:48 2006
+++ /var/tmp/safestr/Makefile	Mon Sep  4 18:11:59 2006
@@ -7,7 +7,7 @@
 
 PORTNAME=	safestr
 PORTVERSION=	1.0.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.zork.org/software/
 
diff -ruN --exclude=CVS /usr/ports/devel/safestr/files/patch-safefmt.c /var/tmp/safestr/files/patch-safefmt.c
--- /usr/ports/devel/safestr/files/patch-safefmt.c	Thu Jan  1 03:00:00 1970
+++ /var/tmp/safestr/files/patch-safefmt.c	Mon Sep  4 18:11:54 2006
@@ -0,0 +1,33 @@
+--- safefmt.c.orig	Mon Sep  4 17:28:27 2006
++++ safefmt.c	Mon Sep  4 18:07:39 2006
+@@ -489,10 +489,10 @@
+         SET_ARGLIST_TYPE(format_arg, type);
+     }
+ 
+-    ap = arglist->ap;
++    va_copy(ap, arglist->ap);
+     for (x = arglist->current;  x < max_arg;  x++)
+         load_argument(x, arglist);
+-    arglist->ap = ap;
++    va_copy(arglist->ap, ap);
+ 
+     arglist->max     = max_arg;
+     arglist->scanned = 1;
+@@ -675,7 +675,7 @@
+     arglist.current = 0;
+     arglist.max     = 0;
+     arglist.scanned = 0;
+-    arglist.ap      = ap;
++    va_copy(arglist.ap, ap);
+     memset(arglist.list, 0, sizeof(arglist.list));
+ 
+     cs_d = 0;
+@@ -683,7 +683,7 @@
+     padding = NULL;
+     *nbytes = padding_size = 0;
+     arglist.current = arglist.max = arglist.scanned = 0;
+-    arglist.ap = ap;
++    va_copy(arglist.ap, ap);
+     trusted = (ifmt->hdr.flags & SAFESTR_TRUSTED) == SAFESTR_TRUSTED;
+ 
+     for (c = start = ifmt->str;  c < ifmt->str + ifmt->hdr.length;  start = ++c)
--- safestr-1.0.3_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->itetcu 
Responsible-Changed-By: itetcu 
Responsible-Changed-When: Mon Sep 4 14:35:40 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=102846 
State-Changed-From-To: open->closed 
State-Changed-By: itetcu 
State-Changed-When: Mon Sep 4 14:38:37 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=102846 
>Unformatted:
