Date: Wed, 26 Jun 2002 14:59:38 -0700 (PDT) From: Siegbert Baude <siegbert.baude@gmx.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/39897: kdebase3 files/patch-kdm-backend-xdmcp.c fails to apply cleanly Message-ID: <200206262159.g5QLxcdO073308@www.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206262159.g5QLxcdO073308>