Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!

Bug 98808

Summary: dpkg-1.10.28 ebuild fails to apply dpkg-1.10.27.gcc4.patch
Product: Gentoo Linux Reporter: Thomas Schorr <t_schorr>
Component: Current packagesAssignee: Gentoo Linux bug wranglers <bug-wranglers>
Status: RESOLVED DUPLICATE    
Severity: normal    
Priority: High    
Version: unspecified   
Hardware: x86   
OS: Linux   
Whiteboard:
Package list:
Runtime testing required: ---

Description Thomas Schorr 2005-07-12 13:24:26 UTC 
the second patch (dpkg-1.10.27.gcc4.patch
) can't be applied. See Actual Results for the complete error message.

I deleted the first hunk in the patch (it seems it is already included in
lib/parse.c) and dpkg was built without further errors. This is the part I deleted:

@@ -96,7 +96,7 @@
   const char *fieldstart, *valuestart;
   char *value= NULL;
   int fieldlen= 0, valuelen= 0;
-  int *ip, c;
+  int *ip, c, i;
   struct stat stat;
 
   if (warncount) *warncount= 0;



Reproducible: Always
Steps to Reproduce:
1.emerge dpkg
2.
3.

Actual Results:  
Calculating dependencies ...done!
>>> emerge (1 of 1) app-arch/dpkg-1.10.28 to /
>>> md5 files   ;-) dpkg-1.10.28.ebuild
>>> md5 files   ;-) files/dpkg-1.10.26.patch
>>> md5 files   ;-) files/digest-dpkg-1.10.28
>>> md5 files   ;-) files/dpkg-1.10.27.gcc4.patch
>>> md5 src_uri ;-) dpkg_1.10.28.tar.gz
>>> Unpacking source...
>>> Unpacking dpkg_1.10.28.tar.gz to /var/tmp/portage/dpkg-1.10.28/work
 * Applying dpkg-1.10.26.patch ...                                             
                                                                               
                                             [ ok ]
 * Applying dpkg-1.10.27.gcc4.patch ...

 * Failed Patch: dpkg-1.10.27.gcc4.patch !
 *  ( /usr/portage/app-arch/dpkg/files/dpkg-1.10.27.gcc4.patch )
 * 
 * Include in your bugreport the contents of:
 * 
 *   /var/tmp/portage/dpkg-1.10.28/temp/dpkg-1.10.27.gcc4.patch-29332.out

....

/var/tmp/portage/dpkg-1.10.28/temp/dpkg-1.10.27.gcc4.patch-29332.out reads:
***** dpkg-1.10.27.gcc4.patch *****

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

PATCH COMMAND:  patch -p0 -g0 --no-backup-if-mismatch <
/usr/portage/app-arch/dpkg/files/dpkg-1.10.27.gcc4.patch

===================================
patching file lib/parse.c
Hunk #1 FAILED at 39.
1 out of 3 hunks FAILED -- saving rejects to file lib/parse.c.rej
===================================

PATCH COMMAND:  patch -p1 -g0 --no-backup-if-mismatch <
/usr/portage/app-arch/dpkg/files/dpkg-1.10.27.gcc4.patch

===================================
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- lib/parse.c.orig   2005-07-07 18:51:15.000000000 +0200
|+++ lib/parse.c        2005-07-07 18:53:35.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored
===================================

PATCH COMMAND:  patch -p2 -g0 --no-backup-if-mismatch <
/usr/portage/app-arch/dpkg/files/dpkg-1.10.27.gcc4.patch

===================================
missing header for unified diff at line 3 of patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- lib/parse.c.orig   2005-07-07 18:51:15.000000000 +0200
|+++ lib/parse.c        2005-07-07 18:53:35.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored
===================================

PATCH COMMAND:  patch -p3 -g0 --no-backup-if-mismatch <
/usr/portage/app-arch/dpkg/files/dpkg-1.10.27.gcc4.patch

===================================
missing header for unified diff at line 3 of patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- lib/parse.c.orig   2005-07-07 18:51:15.000000000 +0200
|+++ lib/parse.c        2005-07-07 18:53:35.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored
===================================

PATCH COMMAND:  patch -p4 -g0 --no-backup-if-mismatch <
/usr/portage/app-arch/dpkg/files/dpkg-1.10.27.gcc4.patch

===================================
missing header for unified diff at line 3 of patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- lib/parse.c.orig   2005-07-07 18:51:15.000000000 +0200
|+++ lib/parse.c        2005-07-07 18:53:35.000000000 +0200
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored



Expected Results:  
dpkg_1.10.28 should be merged.

Portage 2.0.51.22-r1 (default-linux/x86/2005.0, gcc-3.3.5-20050130,
glibc-2.3.4.20041102-r1, 2.6.11-gentoo-r11 i686)
=================================================================
System uname: 2.6.11-gentoo-r11 i686 Intel(R) Pentium(R) 4 Mobile CPU 1.80GHz
Gentoo Base System version 1.6.12
dev-lang/python:     2.3.5
sys-apps/sandbox:    1.2.10
sys-devel/autoconf:  2.13, 2.59-r6
sys-devel/automake:  1.4_p6, 1.5, 1.6.3, 1.7.9-r1, 1.8.5-r3, 1.9.5
sys-devel/binutils:  2.15.92.0.2-r10
sys-devel/libtool:   1.5.18-r1
virtual/os-headers:  2.6.11-r2
ACCEPT_KEYWORDS="x86"
AUTOCLEAN="yes"
CBUILD="i686-pc-linux-gnu"
CFLAGS="-O2 -mcpu=i686 -fomit-frame-pointer"
CHOST="i686-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3.3/env
/usr/kde/3.3/share/config /usr/kde/3.3/shutdown /usr/kde/3.4/env
/usr/kde/3.4/share/config /usr/kde/3.4/shutdown /usr/kde/3/share/config
/usr/lib/X11/xkb /usr/share/config /var/qmail/control"
CONFIG_PROTECT_MASK="/etc/gconf /etc/splash /etc/terminfo /etc/env.d"
CXXFLAGS="-O2 -mcpu=i686 -fomit-frame-pointer"
DISTDIR="/usr/portage/distfiles"
FEATURES="autoconfig distlocks sandbox sfperms strict"
GENTOO_MIRRORS="http://distfiles.gentoo.org
http://distro.ibiblio.org/pub/Linux/distributions/gentoo"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="x86 X alsa apm arts avi berkdb bitmap-fonts cdr crypt cups curl dvd emboss
encode f77 fam foomaticdb fortran gd gdbm gif gpm gtk2 imagemagick imlib ipv6
java jpeg kde libg++ libwww mad mikmod motif mp3 mpeg ncurses nls ogg oggvorbis
opengl oss pam pdflib perl png postgres python qt quicktime readline samba
scanner sdl snmp spell ssl svga tcltk tcpd tiff truetype truetype-fonts
type1-fonts vorbis xml2 xmms xv zlib userland_GNU kernel_linux elibc_glibc"
Unset:  ASFLAGS, CTARGET, LANG, LC_ALL, LDFLAGS, LINGUAS, MAKEOPTS, PORTDIR_OVERLAY
Comment 1 Jakub Moc (RETIRED) gentoo-dev 2005-07-12 13:28:30 UTC 

*** This bug has been marked as a duplicate of 98500 ***