Bug 39897 - kdebase3 files/patch-kdm-backend-xdmcp.c fails to apply cleanly
Summary: kdebase3 files/patch-kdm-backend-xdmcp.c fails to apply cleanly
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-kde (group)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2002-06-27 00:30 UTC by siegbert.baude
Modified: 2002-06-27 01:23 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description siegbert.baude 2002-06-27 00:30:01 UTC
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.

Fix: The files/patch-kdm-backend-xdmcp.c should read:



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;--Cnd9b7rbzmY6GysACTIP7biceCErP1CYw5MEx4GjTbwcdb5l
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

--- 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 @@
How-To-Repeat: cd /usr/ports/x11/kdebase3
make patch
Comment 1 Alan Eldridge freebsd_committer freebsd_triage 2002-06-27 01:22:19 UTC
State Changed
From-To: open->closed

Bug fixed. Thanks for catching it. 


Comment 2 Alan Eldridge freebsd_committer freebsd_triage 2002-06-27 01:22:19 UTC
Responsible Changed
From-To: freebsd-ports->kde

Set to maintainer to keep the record correct.