Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 294902 - dev-util/git-1.6.5.3 fails interix patch
Summary: dev-util/git-1.6.5.3 fails interix patch
Status: RESOLVED FIXED
Alias: None
Product: Gentoo/Alt
Classification: Unclassified
Component: Prefix Support (show other bugs)
Hardware: All Interix
: High normal (vote)
Assignee: Markus Duft (RETIRED)
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2009-11-27 21:22 UTC by Alan Hourihane
Modified: 2010-03-09 10:42 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Alan Hourihane 2009-11-27 21:22:25 UTC
>>> Emerging (3 of 3) dev-util/git-1.6.5.3
 * git-manpages-1.6.5.3.tar.bz2 RMD160 SHA1 SHA256 size ;-) ...          [ ok ]
 * git-1.6.5.3.tar.bz2 RMD160 SHA1 SHA256 size ;-) ...                   [ ok ]
 * checking ebuild checksums ;-) ...                                     [ ok ]
 * checking auxfile checksums ;-) ...                                    [ ok ]
 * checking miscfile checksums ;-) ...                                   [ ok ]
>>> Unpacking source...
>>> Unpacking git-1.6.5.3.tar.bz2 to /j/var/tmp/portage/dev-util/git-1.6.5.3/work
>>> Unpacking git-manpages-1.6.5.3.tar.bz2 to /j/var/tmp/portage/dev-util/git-1.6.5.3/work/git-1.6.5.3
>>> Source unpacked in /j/var/tmp/portage/dev-util/git-1.6.5.3/work
>>> Preparing source in /j/var/tmp/portage/dev-util/git-1.6.5.3/work/git-1.6.5.3 ...
 * Applying git-1.6.3.3-mint.patch ...                                    [ ok ]
 * Applying git-1.6.5-interix.patch ...

 * Failed Patch: git-1.6.5-interix.patch !
 *  ( /j/usr/portage/dev-util/git/files/git-1.6.5-interix.patch )
 * 
 * Include in your bugreport the contents of:
 * 
 *   /j/var/tmp/portage/dev-util/git-1.6.5.3/temp/git-1.6.5-interix.patch-902.out

 * ERROR: dev-util/git-1.6.5.3 failed:
 *   Failed Patch: git-1.6.5-interix.patch!
 * 
 * Call stack:
 *     ebuild.sh, line   51:  Called call-ebuildshell 'src_prepare'
 *   environment, line  491:  Called src_prepare
 *   environment, line 3053:  Called epatch '/j/usr/portage/dev-util/git/files/git-1.6.5-interix.patch'
 *   environment, line 1574:  Called die
 * The specific snippet of code:
 *                   die "Failed Patch: ${patchname}!";
 * 
 * If you need support, post the output of 'emerge --info =dev-util/git-1.6.5.3',
 * the complete build log and the output of 'emerge -pqv =dev-util/git-1.6.5.3'.
 * The complete build log is located at '/j/var/tmp/portage/dev-util/git-1.6.5.3/temp/build.log'.
 * The ebuild environment file is located at '/j/var/tmp/portage/dev-util/git-1.6.5.3/temp/environment'.
 * S: '/j/var/tmp/portage/dev-util/git-1.6.5.3/work/git-1.6.5.3'

>>> Failed to emerge dev-util/git-1.6.5.3




This is the problem.....

PATCH COMMAND:	 patch -p1 -g0 -E --no-backup-if-mismatch < /j/usr/portage/dev-util/git/files/git-1.6.5-interix.patch

===================================
patching file builtin-upload-archive.c
patching file compat/inet_ntop.c
patching file daemon.c
patching file git-compat-util.h
Hunk #2 FAILED at 106.
1 out of 2 hunks FAILED -- saving rejects to file git-compat-util.h.rej
patching file upload-pack.c
===================================
Comment 1 Fabian Groffen gentoo-dev 2009-11-29 19:57:40 UTC
disabled patch for now, looks like it needs fixing since a lot still applies.
Comment 2 Fabian Groffen gentoo-dev 2009-12-04 20:53:10 UTC
for mduft in his free time
Comment 3 Markus Duft (RETIRED) gentoo-dev 2009-12-09 08:55:53 UTC
what free time ;) i'll have a look at it...
Comment 4 Markus Duft (RETIRED) gentoo-dev 2010-03-09 10:42:20 UTC
committed new patch against 1.6.6.1.