Bug 24905

Summary:	emerge util-linux-2.11z-r7 failed diff
Product:	Portage Development	Reporter:	Dan Halperin <junkdan>
Component:	Unclassified	Assignee:	Martin Schlemmer (RETIRED) <azarah>
Status:	RESOLVED FIXED
Severity:	normal
Priority:	High
Version:	unspecified
Hardware:	All
OS:	Linux
Whiteboard:
Package list:		Runtime testing required:	---

Description Dan Halperin 2003-07-20 11:43:10 UTC

# emerge -uD util-linux
Calculating dependencies ...done!
>>> emerge (1 of 1) sys-apps/util-linux-2.11z-r7 to /
>>> md5 src_uri ;-) util-linux-2.11z.tar.bz2
>>> md5 src_uri ;-) util-linux-2.11z-crypt-gentoo.patch.bz2
>>> Unpacking source...
>>> Unpacking util-linux-2.11z.tar.bz2 to /var/tmp/portage/util-linux-2.11z-r7/work
>>> Unpacking util-linux-2.11z-crypt-gentoo.patch.bz2 to
/var/tmp/portage/util-linux-2.11z-r7/work
 * Applying util-linux-2.11z-crypt-gentoo.patch.bz2...                         
                                                                           [ ok ]
 * Applying util-linux-2.11z-parallel-make.patch...                            
                                                                           [ ok ]
 * Applying no-symlink-resolve.patch...                                        
                                                                           [ ok ]
 * Applying util-linux-2.11z-script.patch...                                   
                                                                           [ ok ]
 * Applying util-linux-2.11z-agetty-domainname-option.patch...                 
                                                                           [ ok ]
 * Applying util-linux-2.11z-01-nfsv4.dif...

 * Failed Patch: util-linux-2.11z-01-nfsv4.dif!
 * 
 * Include in your bugreport the contents of:
 * 
 *  
/var/tmp/portage/util-linux-2.11z-r7/temp/util-linux-2.11z-01-nfsv4.dif-25970.out


!!! ERROR: sys-apps/util-linux-2.11z-r7 failed.
!!! Function epatch, Line 321, Exitcode 0
!!! Failed Patch: util-linux-2.11z-01-nfsv4.dif!


--- CONTENTS OF THE .OUT FILE ---
2.11z-01-nfsv4.dif-25970.out ar/tmp/portage/util-linux-2.11z-r7/temp/util-linux-2
***** util-linux-2.11z-01-nfsv4.dif *****

=========================================

PATCH COMMAND:  patch  -p0 <
/usr/portage/sys-apps/util-linux/files/util-linux-2.11z-01-nfsv4.dif

=========================================
can't find file to patch at input line 15
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|
|Add support for nfsv4 to mount
|
|
| mount/Makefile     |    4 
| mount/mount.c      |   13 ++
| mount/nfs4_mount.h |   82 +++++++++++++
| mount/nfs4mount.c  |  323 +++++++++++++++++++++++++++++++++++++++++++++++++++++
| mount/sundries.h   |    2 
| 5 files changed, 422 insertions(+), 2 deletions(-)
|
|diff -puN mount/Makefile~nfsv4 mount/Makefile
|--- util-linux-2.11z/mount/Makefile~nfsv4      2003-04-23 16:40:57.000000000 -0400
|+++ util-linux-2.11z-bfields/mount/Makefile    2003-04-23 16:40:57.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 29
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -puN mount/mount.c~nfsv4 mount/mount.c
|--- util-linux-2.11z/mount/mount.c~nfsv4       2003-04-23 16:40:57.000000000 -0400
|+++ util-linux-2.11z-bfields/mount/mount.c     2003-04-23 16:40:57.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
patching file util-linux-2.11z-bfields/mount/nfs4_mount.h
patching file util-linux-2.11z-bfields/mount/nfs4mount.c
can't find file to patch at input line 465
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -puN mount/sundries.h~nfsv4 mount/sundries.h
|--- util-linux-2.11z/mount/sundries.h~nfsv4    2003-04-23 16:40:57.000000000 -0400
|+++ util-linux-2.11z-bfields/mount/sundries.h  2003-04-23 16:40:57.000000000
-0400--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
=========================================

PATCH COMMAND:  patch  -p1 <
/usr/portage/sys-apps/util-linux/files/util-linux-2.11z-01-nfsv4.dif

=========================================
patching file mount/Makefile
Hunk #1 FAILED at 25.
1 out of 1 hunk FAILED -- saving rejects to file mount/Makefile.rej
patching file mount/mount.c
Hunk #1 succeeded at 811 (offset 8 lines).
patching file mount/nfs4_mount.h
patching file mount/nfs4mount.c
patching file mount/sundries.h
=========================================

PATCH COMMAND:  patch  -p2 <
/usr/portage/sys-apps/util-linux/files/util-linux-2.11z-01-nfsv4.dif

=========================================
patching file Makefile
Hunk #1 FAILED at 25.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej
can't find file to patch at input line 29
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -puN mount/mount.c~nfsv4 mount/mount.c
|--- util-linux-2.11z/mount/mount.c~nfsv4       2003-04-23 16:40:57.000000000 -0400
|+++ util-linux-2.11z-bfields/mount/mount.c     2003-04-23 16:40:57.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
patching file nfs4_mount.h
patching file nfs4mount.c
can't find file to patch at input line 465
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -puN mount/sundries.h~nfsv4 mount/sundries.h
|--- util-linux-2.11z/mount/sundries.h~nfsv4    2003-04-23 16:40:57.000000000 -0400
|+++ util-linux-2.11z-bfields/mount/sundries.h  2003-04-23 16:40:57.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
=========================================

PATCH COMMAND:  patch  -p3 <
/usr/portage/sys-apps/util-linux/files/util-linux-2.11z-01-nfsv4.dif

=========================================
missing header for unified diff at line 15 of patch
can't find file to patch at input line 15
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|
|Add support for nfsv4 to mount
|
|
| mount/Makefile     |    4 
| mount/mount.c      |   13 ++
| mount/nfs4_mount.h |   82 +++++++++++++
| mount/nfs4mount.c  |  323 +++++++++++++++++++++++++++++++++++++++++++++++++++++
| mount/sundries.h   |    2 
| 5 files changed, 422 insertions(+), 2 deletions(-)
|
|diff -puN mount/Makefile~nfsv4 mount/Makefile
|--- util-linux-2.11z/mount/Makefile~nfsv4      2003-04-23 16:40:57.000000000 -0400
|+++ util-linux-2.11z-bfields/mount/Makefile    2003-04-23 16:40:57.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 29 of patch
can't find file to patch at input line 29
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -puN mount/mount.c~nfsv4 mount/mount.c
|--- util-linux-2.11z/mount/mount.c~nfsv4       2003-04-23 16:40:57.000000000 -0400
|+++ util-linux-2.11z-bfields/mount/mount.c     2003-04-23 16:40:57.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 52 of patch
can't find file to patch at input line 52
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -puN /dev/null mount/nfs4_mount.h
|--- /dev/null  2003-01-08 17:56:04.000000000 -0500
|+++ util-linux-2.11z-bfields/mount/nfs4_mount.h        2003-04-23
16:40:57.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 138 of patch
can't find file to patch at input line 138
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -puN /dev/null mount/nfs4mount.c
|--- /dev/null  2003-01-08 17:56:04.000000000 -0500
|+++ util-linux-2.11z-bfields/mount/nfs4mount.c 2003-04-23 17:28:54.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 465 of patch
can't find file to patch at input line 465
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -puN mount/sundries.h~nfsv4 mount/sundries.h
|--- util-linux-2.11z/mount/sundries.h~nfsv4    2003-04-23 16:40:57.000000000 -0400
|+++ util-linux-2.11z-bfields/mount/sundries.h  2003-04-23 16:40:57.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
=========================================

PATCH COMMAND:  patch  -p4 <
/usr/portage/sys-apps/util-linux/files/util-linux-2.11z-01-nfsv4.dif

=========================================
missing header for unified diff at line 15 of patch
can't find file to patch at input line 15
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|
|Add support for nfsv4 to mount
|
|
| mount/Makefile     |    4 
| mount/mount.c      |   13 ++
| mount/nfs4_mount.h |   82 +++++++++++++
| mount/nfs4mount.c  |  323 +++++++++++++++++++++++++++++++++++++++++++++++++++++
| mount/sundries.h   |    2 
| 5 files changed, 422 insertions(+), 2 deletions(-)
|
|diff -puN mount/Makefile~nfsv4 mount/Makefile
|--- util-linux-2.11z/mount/Makefile~nfsv4      2003-04-23 16:40:57.000000000 -0400
|+++ util-linux-2.11z-bfields/mount/Makefile    2003-04-23 16:40:57.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 29 of patch
can't find file to patch at input line 29
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -puN mount/mount.c~nfsv4 mount/mount.c
|--- util-linux-2.11z/mount/mount.c~nfsv4       2003-04-23 16:40:57.000000000 -0400
|+++ util-linux-2.11z-bfields/mount/mount.c     2003-04-23 16:40:57.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 52 of patch
can't find file to patch at input line 52
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -puN /dev/null mount/nfs4_mount.h
|--- /dev/null  2003-01-08 17:56:04.000000000 -0500
|+++ util-linux-2.11z-bfields/mount/nfs4_mount.h        2003-04-23
16:40:57.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 138 of patch
can't find file to patch at input line 138
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -puN /dev/null mount/nfs4mount.c
|--- /dev/null  2003-01-08 17:56:04.000000000 -0500
|+++ util-linux-2.11z-bfields/mount/nfs4mount.c 2003-04-23 17:28:54.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 465 of patch
can't find file to patch at input line 465
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -puN mount/sundries.h~nfsv4 mount/sundries.h
|--- util-linux-2.11z/mount/sundries.h~nfsv4    2003-04-23 16:40:57.000000000 -0400
|+++ util-linux-2.11z-bfields/mount/sundries.h  2003-04-23 16:40:57.000000000 -0400
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored



Reproducible: Always
Steps to Reproduce:
1. Just ran emerge -uD util-linux
2. Also in emerge -uD world
3.

Actual Results:  
Crashed on the diff

Expected Results:  
Not crashed on the diff?

# emerge info
Portage 2.0.48-r5 (default-x86-1.4, gcc-3.2.3, glibc-2.3.2-r1)
=================================================================
System uname: 2.4.20-gentoo-r3 i686 AMD Athlon(tm) 4 Processor
GENTOO_MIRRORS="http://gentoo.oregonstate.edu
http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
CONFIG_PROTECT="/etc /var/qmail/control /usr/kde/2/share/config
/usr/X11R6/lib/X11/xkb /usr/kde/3.1/share/config /usr/kde/3/share/config
/usr/share/texmf/tex/generic/config/ /usr/share/texmf/tex/platex/config/
/usr/share/config"
CONFIG_PROTECT_MASK="/etc/gconf /etc/env.d"
PORTDIR="/usr/portage"
DISTDIR="/usr/portage/distfiles"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR_OVERLAY=""
USE="x86 oss 3dnow apm avi crypt cups encode foomaticdb gif jpeg libg++ mad
mikmod mmx mpeg ncurses nls pdflib png quicktime spell truetype xml2 xmms xv
zlib gdbm berkdb slang readline arts tetex svga ggi tcltk java guile mysql sdl
gpm tcpd pam libwww ssl perl python esd imlib gtk qt motif opengl -gnome -kde X
alsa ati oggvorbis"
COMPILER="gcc3"
CHOST="i686-pc-linux-gnu"
CFLAGS="-march=athlon-xp -O3 -pipe"
CXXFLAGS="-march=athlon-xp -O3 -pipe"
ACCEPT_KEYWORDS="x86 ~x86"
MAKEOPTS="-j2"
AUTOCLEAN="yes"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
FEATURES="sandbox ccache"

Comment 1 Martin Schlemmer (RETIRED) gentoo-dev

2003-07-21 08:43:41 UTC

This should already be fixed - solar gave heads up on his system (I did not
have crypt in USE, sorry).