From owner-freebsd-ports  Wed Jun 26 17: 7:27 2002
Delivered-To: freebsd-ports@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id A499B37C068
	for <freebsd-ports@hub.freebsd.org>; Wed, 26 Jun 2002 16:30:02 -0700 (PDT)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g5QNU2JU082265
	for <freebsd-ports@freefall.freebsd.org>; Wed, 26 Jun 2002 16:30:02 -0700 (PDT)
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g5QNU2XK082264;
	Wed, 26 Jun 2002 16:30:02 -0700 (PDT)
Received: from www.freebsd.org (www.FreeBSD.org [216.136.204.117])
	by hub.freebsd.org (Postfix) with ESMTP id 7ED3A37B895
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 26 Jun 2002 16:02:14 -0700 (PDT)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.12.4/8.12.4) with ESMTP id g5QLxcOT073309
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 26 Jun 2002 14:59:38 -0700 (PDT)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.4/8.12.4/Submit) id g5QLxcdO073308;
	Wed, 26 Jun 2002 14:59:38 -0700 (PDT)
Message-Id: <200206262159.g5QLxcdO073308@www.freebsd.org>
Date: Wed, 26 Jun 2002 14:59:38 -0700 (PDT)
From: Siegbert Baude <siegbert.baude@gmx.de>
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/39897: kdebase3 files/patch-kdm-backend-xdmcp.c fails to apply cleanly
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org


>Number:         39897
>Category:       ports
>Synopsis:       kdebase3 files/patch-kdm-backend-xdmcp.c fails to apply cleanly
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 26 16:30:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     Siegbert Baude
>Release:        4.6-STABLE
>Organization:
>Environment:
FreeBSD 4.6-STABLE #2: Thu Jun 20 18:05:55 CEST 2002
>Description:
A "make patch" in x11/kdebase3 gives a warning because the file files/patch-kdm-backend-xdmcp.c is malformed. It reads:

su-2.05a# cat patch-kdm-backend-xdmcp.c
++--- kdm/backend/xdmcp.c.orig  Sun May 19 10:38:01 2002
+++++ kdm/backend/xdmcp.c       Sun May 19 10:38:16 2002
++@@ -1012,7 +1012,7 @@

     sprintf (buf, "Session %ld failed for display %.260s: %s",
             (long) sessionID, name, reason);
-    Debug ("send_failed(%\"s)", buf);
+    Debug ("send_failed(%s)\n", buf);
     status.length = strlen (buf);
     status.data = (CARD8Ptr) buf;
     header.version = XDM_PROTOCOL_VERSION;
su-2.05a#

whereas the line in the file, which should be changed actually is:

    Debug ("send_failed(%\"s)\n", buf);

Note the additional \n compared to what the patch file assumes.
>How-To-Repeat:
cd /usr/ports/x11/kdebase3
make patch
>Fix:
The files/patch-kdm-backend-xdmcp.c should read:

--- kdm/backend/xdmcp.c.orig  Sun May 19 10:38:01 2002
+++ kdm/backend/xdmcp.c       Sun May 19 10:38:16 2002
@@ -1012,7 +1012,7 @@

     sprintf (buf, "Session %ld failed for display %.260s: %s",
             (long) sessionID, name, reason);
-    Debug ("send_failed(%\"s)\n", buf);
+    Debug ("send_failed(%s)\n", buf);
     status.length = strlen (buf);
     status.data = (CARD8Ptr) buf;
     header.version = XDM_PROTOCOL_VERSION;


>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message