Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 49823 - patch-2.5.9 rejects valid patch [mysql++-1.7.9-r3 fails applying gcc3.4 patch]
Summary: patch-2.5.9 rejects valid patch [mysql++-1.7.9-r3 fails applying gcc3.4 patch]
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: New packages (show other bugs)
Hardware: All Linux
: High critical (vote)
Assignee: Gentoo's Team for Core System packages
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 48528
  Show dependency tree
 
Reported: 2004-05-03 03:47 UTC by JoWilly
Modified: 2006-09-14 14:31 UTC (History)
2 users (show)

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 JoWilly 2004-05-03 03:47:23 UTC
>>> emerge (1 of 1) dev-db/mysql++-1.7.9-r3 to /
>>> md5 src_uri ;-) mysql++-1.7.9.tar.gz
>>> md5 src_uri ;-) mysql++-gcc-3.0.patch.gz
>>> md5 src_uri ;-) mysql++-gcc-3.2.patch.gz
>>> md5 src_uri ;-) mysql++-gcc-3.2.2.patch.gz
>>> md5 src_uri ;-) patch_gcc_3.3.gz
>>> md5 src_uri ;-) mysqlplus-gcc-3.4.patch.gz
>>> Unpacking source...
>>> Unpacking mysql++-1.7.9.tar.gz to /var/tmp/portage/mysql++-1.7.9-r3/work
 * Patching for gcc 3.0...                                                [ ok ]
 * Patching for gcc 3.4 (patch for 3.2 needed first)...                   [ ok ]
 * Patching for gcc 3.4...

 * Failed Patch: mysqlplus-gcc-3.4.patch.gz!
 *
 * Include in your bugreport the contents of:
 *
 *   /var/tmp/portage/mysql++-1.7.9-r3/temp/mysqlplus-gcc-3.4.patch.gz-23894.out

------------------------------------------------------------

#less /var/tmp/portage/mysql++-1.7.9-r3/temp/mysqlplus-gcc-3.4.patch.gz-23894.out

***** mysqlplus-gcc-3.4.patch.gz *****

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

PIPE_COMMAND:  gzip -dc /usr/portage/distfiles/mysqlplus-gcc-3.4.patch.gz > /var/tmp/portage/mysql++-1.7.9-r3/temp/23894.patch
PATCH COMMAND:  patch -p0 -p1 -d /var/tmp/portage/mysql++-1.7.9-r3/work/mysql++-1.7.9 < /var/tmp/portage/mysql++-1.7.9-r3/temp/23894.patch

======================================
patching file sqlplusint/compare1.hh
patching file sqlplusint/connection1.hh
patching file sqlplusint/datetime.cc
patching file sqlplusint/datetime1.hh
patching file sqlplusint/exceptions.hh
patching file sqlplusint/field_names1.hh
patching file sqlplusint/field_types1.hh
patching file sqlplusint/manip.cc
patching file sqlplusint/manip1.hh
patching file sqlplusint/query.cc
patching file sqlplusint/resiter1.hh
patching file sqlplusint/result1.hh
patching file sqlplusint/row2.hh
patching file sqlplusint/set1.hh
patching file sqlplusint/set3.hh
patching file sqlplusint/sql_query.cc
patching file sqlplusint/sql_query1.hh
patching file sqlplusint/stream2string3.hh
patch: **** context mangled in hunk at line 664
======================================

PIPE_COMMAND:  gzip -dc /usr/portage/distfiles/mysqlplus-gcc-3.4.patch.gz > /var/tmp/portage/mysql++-1.7.9-r3/temp/23894.patch
PATCH COMMAND:  patch -p1 -p1 -d /var/tmp/portage/mysql++-1.7.9-r3/work/mysql++-1.7.9 < /var/tmp/portage/mysql++-1.7.9-r3/temp/23894.patch

======================================
patching file sqlplusint/compare1.hh
patching file sqlplusint/connection1.hh
patching file sqlplusint/datetime.cc
patching file sqlplusint/datetime1.hh
patching file sqlplusint/exceptions.hh
patching file sqlplusint/field_names1.hh
patching file sqlplusint/field_types1.hh
patching file sqlplusint/manip.cc
patching file sqlplusint/manip1.hh
patching file sqlplusint/query.cc
patching file sqlplusint/resiter1.hh
patching file sqlplusint/result1.hh
patching file sqlplusint/row2.hh
patching file sqlplusint/set1.hh
patching file sqlplusint/set3.hh
patching file sqlplusint/sql_query.cc
patching file sqlplusint/sql_query1.hh
patching file sqlplusint/stream2string3.hh
patch: **** context mangled in hunk at line 664
======================================

PIPE_COMMAND:  gzip -dc /usr/portage/distfiles/mysqlplus-gcc-3.4.patch.gz > /var/tmp/portage/mysql++-1.7.9-r3/temp/23894.patch
PATCH COMMAND:  patch -p2 -p1 -d /var/tmp/portage/mysql++-1.7.9-r3/work/mysql++-1.7.9 < /var/tmp/portage/mysql++-1.7.9-r3/temp/23894.patch

======================================
patching file sqlplusint/compare1.hh
patching file sqlplusint/connection1.hh
patching file sqlplusint/datetime.cc
patching file sqlplusint/datetime1.hh
patching file sqlplusint/exceptions.hh
patching file sqlplusint/field_names1.hh
patching file sqlplusint/field_types1.hh
patching file sqlplusint/manip.cc
patching file sqlplusint/manip1.hh
patching file sqlplusint/query.cc
patching file sqlplusint/resiter1.hh
patching file sqlplusint/result1.hh
patching file sqlplusint/row2.hh
patching file sqlplusint/set1.hh
patching file sqlplusint/set3.hh
patching file sqlplusint/sql_query.cc
patching file sqlplusint/sql_query1.hh
patching file sqlplusint/stream2string3.hh
patch: **** context mangled in hunk at line 664
======================================

PIPE_COMMAND:  gzip -dc /usr/portage/distfiles/mysqlplus-gcc-3.4.patch.gz > /var/tmp/portage/mysql++-1.7.9-r3/temp/23894.patch
PATCH COMMAND:  patch -p3 -p1 -d /var/tmp/portage/mysql++-1.7.9-r3/work/mysql++-1.7.9 < /var/tmp/portage/mysql++-1.7.9-r3/temp/23894.patch

======================================
patching file sqlplusint/compare1.hh
patching file sqlplusint/connection1.hh
patching file sqlplusint/datetime.cc
patching file sqlplusint/datetime1.hh
patching file sqlplusint/exceptions.hh
patching file sqlplusint/field_names1.hh
patching file sqlplusint/field_types1.hh
patching file sqlplusint/manip.cc
patching file sqlplusint/manip1.hh
patching file sqlplusint/query.cc
patching file sqlplusint/resiter1.hh
patching file sqlplusint/result1.hh
patching file sqlplusint/row2.hh
patching file sqlplusint/set1.hh
patching file sqlplusint/set3.hh
patching file sqlplusint/sql_query.cc
patching file sqlplusint/sql_query1.hh
patching file sqlplusint/stream2string3.hh
patch: **** context mangled in hunk at line 664
======================================

PIPE_COMMAND:  gzip -dc /usr/portage/distfiles/mysqlplus-gcc-3.4.patch.gz > /var/tmp/portage/mysql++-1.7.9-r3/temp/23894.patch
PATCH COMMAND:  patch -p4 -p1 -d /var/tmp/portage/mysql++-1.7.9-r3/work/mysql++-1.7.9 < /var/tmp/portage/mysql++-1.7.9-r3/temp/23894.patch

======================================
patching file sqlplusint/compare1.hh
patching file sqlplusint/connection1.hh
patching file sqlplusint/datetime.cc
patching file sqlplusint/datetime1.hh
patching file sqlplusint/exceptions.hh
patching file sqlplusint/field_names1.hh
patching file sqlplusint/field_types1.hh
patching file sqlplusint/manip.cc
patching file sqlplusint/manip1.hh
patching file sqlplusint/query.cc
patching file sqlplusint/resiter1.hh
patching file sqlplusint/result1.hh
patching file sqlplusint/row2.hh
patching file sqlplusint/set1.hh
patching file sqlplusint/set3.hh
patching file sqlplusint/sql_query.cc
patching file sqlplusint/sql_query1.hh
patching file sqlplusint/stream2string3.hh
patch: **** context mangled in hunk at line 664


--------------------------------------------

# emerge info
Portage 2.0.50-r6 (default-x86-2004.0, gcc-3.4.0, glibc-2.3.3_pre20040420-r0, 2.6.5-gentoo)
=================================================================
System uname: 2.6.5-gentoo i686 Intel(R) Pentium(R) 4 CPU 2.80GHz
Gentoo Base System version 1.4.10
Autoconf: sys-devel/autoconf-2.59-r3
Automake: sys-devel/automake-1.8.3
ACCEPT_KEYWORDS="x86 ~x86"
AUTOCLEAN="yes"
CFLAGS="-O3 -march=pentium4 -ffast-math -pipe -fomit-frame-pointer -fPIC"
CHOST="i686-pc-linux-gnu"
COMPILER="gcc3"
CONFIG_PROTECT="/etc /usr/X11R6/lib/X11/xkb /usr/kde/2/share/config /usr/kde/3.2/share/config /usr/kde/3/share/config /usr/lib/mozilla/defaults/pref /usr/share/config /var/qmail/control"
CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d"
CXXFLAGS="-O3 -march=pentium4 -ffast-math -pipe -fomit-frame-pointer -fPIC"
DISTDIR="/usr/portage/distfiles"
FEATURES="autoaddcvs ccache prelink sandbox"
GENTOO_MIRRORS="http://ftp.snt.utwente.nl/pub/os/linux/gentoo http://ftp.easynet.nl/mirror/gentoo/ ftp://ftp.snt.utwente.nl/pub/os/linux/gentoo"
MAKEOPTS="-j2"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/local/overlays/portage /usr/local/overlays/bmg-gnome-current"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="X aalib acpi alsa apm arts avi berkdb breakme cdr crypt cups dga dvd dvdr encode flash foomaticdb gdbm gif gimpprint gnome gphoto2 gpm gtk gtk2 icc imlib java jpeg kde ldap libg++ libwww mad mikmod mmx motif mozilla mpeg mysql nas ncurses nls nptl oggvorbis opengl oss pam pdflib perl png ppds python qt quicktime readline scanner sdl slang spell sse sse2 ssl tcltk tcpd truetype usb x86 xml2 xmms xv zlib"



Reproducible: Always
Steps to Reproduce:
1.emerge  mysql++
Comment 1 Robin Johnson archtester Gentoo Infrastructure gentoo-dev Security 2004-05-19 21:05:36 UTC
patch applies perfectly fine with patch-2.5.4-r5, but not patch-2.5.9.
Comment 2 Robin Johnson archtester Gentoo Infrastructure gentoo-dev Security 2004-06-18 02:26:53 UTC
i've tweaked the patch manually, please test out -r6 of the ebuild when it hits the mirrors.
Comment 3 JoWilly 2004-06-18 15:54:06 UTC
Ok, this is what I get :
>>> Unpacking mysql++-1.7.9.tar.gz to /var/tmp/portage/mysql++-1.7.9-r6/work
 * Patching for gcc 3.0...                                                [ ok ]
 * Patching for gcc 3.4 (patch for 3.2 needed first)...                   [ ok ]
 * Patching for gcc 3.4...                                                [ ok ]
 * Patching to fix some warnings and errors...

 * Failed Patch: mysql++-1.7.9-gcc_throw.patch!
 *
 * Include in your bugreport the contents of:
 *
 *   /var/tmp/portage/mysql++-1.7.9-r6/temp/mysql++-1.7.9-gcc_throw.patch-11153.out


!!! ERROR: dev-db/mysql++-1.7.9-r6 failed.
!!! Function epatch, Line 322, Exitcode 0
!!! Failed Patch: mysql++-1.7.9-gcc_throw.patch!

----------------
***** mysql++-1.7.9-gcc_throw.patch *****

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

PATCH COMMAND:  patch -p0 -p1 -d /var/tmp/portage/mysql++-1.7.9-r6/work/mysql++-1.7.9 < /usr/portage/dev-db/mysql++/files/mysql++-1.7.9-gcc_throw.patch

=========================================
patching file sqlplusint/connection1.hh
Hunk #1 FAILED at 11.
1 out of 1 hunk FAILED -- saving rejects to file sqlplusint/connection1.hh.rej
patching file sqlplusint/convert1.hh
patching file sqlplusint/exceptions.hh
Hunk #1 FAILED at 13.
Hunk #2 FAILED at 42.
Hunk #3 FAILED at 52.
3 out of 3 hunks FAILED -- saving rejects to file sqlplusint/exceptions.hh.rej
patching file sqlplusint/result1.hh
=========================================

PATCH COMMAND:  patch -p1 -p1 -d /var/tmp/portage/mysql++-1.7.9-r6/work/mysql++-1.7.9 < /usr/portage/dev-db/mysql++/files/mysql++-1.7.9-gcc_throw.patch

=========================================
patching file sqlplusint/connection1.hh
Hunk #1 FAILED at 11.
1 out of 1 hunk FAILED -- saving rejects to file sqlplusint/connection1.hh.rej
patching file sqlplusint/convert1.hh
patching file sqlplusint/exceptions.hh
Hunk #1 FAILED at 13.
Hunk #2 FAILED at 42.
Hunk #3 FAILED at 52.
3 out of 3 hunks FAILED -- saving rejects to file sqlplusint/exceptions.hh.rej
patching file sqlplusint/result1.hh
=========================================

PATCH COMMAND:  patch -p2 -p1 -d /var/tmp/portage/mysql++-1.7.9-r6/work/mysql++-1.7.9 < /usr/portage/dev-db/mysql++/files/mysql++-1.7.9-gcc_throw.patch

=========================================
patching file sqlplusint/connection1.hh
Hunk #1 FAILED at 11.
1 out of 1 hunk FAILED -- saving rejects to file sqlplusint/connection1.hh.rej
patching file sqlplusint/convert1.hh
patching file sqlplusint/exceptions.hh
Hunk #1 FAILED at 13.
Hunk #2 FAILED at 42.
Hunk #3 FAILED at 52.
3 out of 3 hunks FAILED -- saving rejects to file sqlplusint/exceptions.hh.rej
patching file sqlplusint/result1.hh
=========================================

PATCH COMMAND:  patch -p3 -p1 -d /var/tmp/portage/mysql++-1.7.9-r6/work/mysql++-1.7.9 < /usr/portage/dev-db/mysql++/files/mysql++-1.7.9-gcc_throw.patch

=========================================
patching file sqlplusint/connection1.hh
Hunk #1 FAILED at 11.
1 out of 1 hunk FAILED -- saving rejects to file sqlplusint/connection1.hh.rej
patching file sqlplusint/convert1.hh
patching file sqlplusint/exceptions.hh
Hunk #1 FAILED at 13.
Hunk #2 FAILED at 42.
Hunk #3 FAILED at 52.
3 out of 3 hunks FAILED -- saving rejects to file sqlplusint/exceptions.hh.rej
patching file sqlplusint/result1.hh
=========================================

PATCH COMMAND:  patch -p4 -p1 -d /var/tmp/portage/mysql++-1.7.9-r6/work/mysql++-1.7.9 < /usr/portage/dev-db/mysql++/files/mysql++-1.7.9-gcc_throw.patch

=========================================
patching file sqlplusint/connection1.hh
Hunk #1 FAILED at 11.
1 out of 1 hunk FAILED -- saving rejects to file sqlplusint/connection1.hh.rej
patching file sqlplusint/convert1.hh
patching file sqlplusint/exceptions.hh
Hunk #1 FAILED at 13.
Hunk #2 FAILED at 42.
Hunk #3 FAILED at 52.
3 out of 3 hunks FAILED -- saving rejects to file sqlplusint/exceptions.hh.rej
patching file sqlplusint/result1.hh

-----------------------

# emerge info
Portage 2.0.50-r8 (default-x86-2004.0, gcc-3.4.0, glibc-2.3.4.20040605-r1, 2.6.7-rc3-love1)
=================================================================
System uname: 2.6.7-rc3-love1 i686 Intel(R) Pentium(R) 4 CPU 2.80GHz
Gentoo Base System version 1.4.16
Autoconf: sys-devel/autoconf-2.59-r4
Automake: sys-devel/automake-1.8.5
ACCEPT_KEYWORDS="x86 ~x86"
AUTOCLEAN="yes"
CFLAGS="-O3 -march=pentium4 -pipe -fomit-frame-pointer -fPIC"
CHOST="i686-pc-linux-gnu"
COMPILER="gcc3"
CONFIG_PROTECT="/etc /usr/X11R6/lib/X11/xkb /usr/kde/2/share/config /usr/kde/3.2/share/config /usr/kde/3.3/share/config /usr/kde/3/share/config /usr/lib/mozilla/defaults/pref /usr/share/config /var/qmail/control"
CONFIG_PROTECT_MASK="/etc/gconf /etc/terminfo /etc/env.d"
CXXFLAGS="-O3 -march=pentium4 -pipe -fomit-frame-pointer -fPIC"
DISTDIR="/usr/portage/distfiles"
FEATURES="autoaddcvs ccache prelink sandbox"
GENTOO_MIRRORS="ftp://mirrors.sec.informatik.tu-darmstadt.de/gentoo/ ftp://ftp.join.uni-muenster.de/pub/linux/distributions/gentoo ftp://ftp6.uni-muenster.de/pub/linux/distributions/gentoo http://mirrors.sec.informatik.tu-darmstadt.de/gentoo/"
MAKEOPTS="-j2"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/local/overlays/portage /usr/local/overlays/bmg-gnome-current"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="X aalib acpi alsa apache2 apm arts avi berkdb breakme cdr crypt cups dga dvd dvdr encode flash foomaticdb gdbm gif gimpprint gnome gphoto2 gpm gtk gtk2 icc imlib java jpeg kde ldap libg++ libwww mad mikmod mmx motif mozilla mpeg mysql nas ncurses nls nptl oggvorbis ooo-kde opengl oss pam pdflib perl png ppds python qt quicktime readline scanner sdl slang spell sse sse2 ssl tcltk tcpd truetype usb x86 xml2 xmms xv zlib"

Comment 4 Joshua Kinard gentoo-dev 2004-06-18 16:30:13 UTC
I've seen several other random cases of patch-2.5.9 failing to apply a perfectly acceptable patch when 2.5.4 works fine.  Now oddly enough, GNU's last release of patch that I can find is 2.5.4.  the 2.5.9 version either was released by some distributor, or somehow is hosted elsewhere (because ftp.gnu.org is still not fully functional after last August's breakin).  Any reasons not to roll back to 2.5.4 if these random failures keep up?
Comment 5 SpanKY gentoo-dev 2004-06-18 17:02:54 UTC
going by the changes in the NEWS file, i dont think theres anything in 2.5.9 we really 'need'

Comment 6 Aron Griffis (RETIRED) gentoo-dev 2004-08-01 16:17:02 UTC
This looks a lot like http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=196297
I'll bet the current Debian patch would solve the problem.  http://packages.debian.org/unstable/utils/patch.html
Comment 7 SpanKY gentoo-dev 2004-11-15 23:07:39 UTC
2.5.9-r1 is in portage with the deb patch
Comment 8 Jakub Moc (RETIRED) gentoo-dev 2006-09-14 14:31:53 UTC
*** Bug 143508 has been marked as a duplicate of this bug. ***