Bug 400809 – net-p2p/transmission-2.42 transmission-2.42-natpmp-system.patch doesn't apply cleanly

• Status: RESOLVED FIXED
• Product: Gentoo Linux

[Description Ben Kohler 2012-01-25 20:06:47 UTC]

Looks like the part of the patch to move natpmp.h to natpmp_local.h has wrong CVS header info so the file isn't able to be removed.  Attaching fixed patch with proper (original) CVS header.

Reproducible: Always

Steps to Reproduce:
1.  emerge =transmission-2.42
Actual Results:  
 * Applying transmission-2.42-respect-cflags.patch ...                   [ ok ]
 * Applying transmission-2.42-natpmp-system.patch ...

 * Failed Patch: transmission-2.42-natpmp-system.patch !
 *  ( /usr/portage/net-p2p/transmission/files/transmission-2.42-natpmp-system.patch )



patch program exited with status 1
=================================================

PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch < '/usr/portage/net-p2p/transmission/files/transmission-2.42-natpmp-system.patch'

=================================================
patching file cli/Makefile.am
patching file configure.ac
patching file daemon/Makefile.am
patching file gtk/Makefile.am
patching file libtransmission/Makefile.am
patching file libtransmission/natpmp.c
patching file libtransmission/natpmp.h
Hunk #1 FAILED at 1.
File libtransmission/natpmp.h is not empty after patch, as expected
1 out of 1 hunk FAILED -- saving rejects to file libtransmission/natpmp.h.rej
patching file libtransmission/natpmp_local.h
patching file libtransmission/port-forwarding.c
patching file qt/config.in
patching file qt/qtr.pro
patching file third-party/Makefile.am
patching file utils/Makefile.am

patch program exited with status 1

[Comment 1 Ben Kohler 2012-01-25 20:08:59 UTC]

Created attachment 299893 [details, diff]
fixed transmission-2.42-natpmp-system.patch

actual changes:

< - * $Id: transmission-2.42-natpmp-system.patch,v 1.1 2012/01/25 14:33:01 scarabeus Exp $
---
> - * $Id: natpmp.h 12204 2011-03-22 15:19:54Z jordan $
174c174
< + * $Id: transmission-2.42-natpmp-system.patch,v 1.1 2012/01/25 14:33:01 scarabeus Exp $
---
> + * $Id: natpmp.h 12204 2011-03-22 15:19:54Z jordan $

[Comment 2 Ben Kohler 2012-01-25 20:18:38 UTC]

I guess I didn't really think it over thoroughly, I'm sure you already HAVE the proper patch, CVS just clobbered it behind your back =)

[Comment 3 Kamil Kamiński 2012-01-25 20:48:44 UTC]

Created attachment 299897 [details]
patch.out.

Same here, attached failing patch output.

[Comment 4 Mike Gilbert 2012-01-25 22:53:17 UTC]

Possible solution:

cvs rm -f files/transmission-2.42-natpmp-system.patch
repoman ci -m "Remove bad patch"
Copy in fresh copy of patch
cvs add -ko files/transmission-2.42-natpmp-system.patch
repoman ci -m "Add patch with keyword substitution disabled"

[Comment 5 Mike Gilbert 2012-01-26 00:15:23 UTC]

I went ahead with my "solution" from comment 4. I'll try and check rsync later to make sure it worked.

[Comment 6 Mike Gilbert 2012-01-26 01:12:19 UTC]

Ok, looks good in rsync.