29105 – net-misc/openssh-3.7.1_p1-r1 doesn't build with USE="X509" (patch problem)

Bug 29105 - net-misc/openssh-3.7.1_p1-r1 doesn't build with USE="X509" (patch problem)

Summary: net-misc/openssh-3.7.1_p1-r1 doesn't build with USE="X509" (patch problem)

Status:	RESOLVED FIXED

Alias:	None

Product:	Gentoo Linux
Classification:	Unclassified
Component:	Current packages (show other bugs)
Hardware:	All Linux

Importance:	High normal (vote)
Assignee:	Daniel Ahlberg (RETIRED)

URL:
Whiteboard:
Keywords:

Depends on:
Blocks:

Reported:	2003-09-19 05:29 UTC by SpanKY
Modified:	2003-09-19 06:28 UTC (History)
CC List:	1 user (show)

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

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description SpanKY gentoo-dev

2003-09-19 05:29:57 UTC

net-misc/openssh-3.7.1_p1-r1 doesn't apply the X509 patch properly - it tries p0
instead of p1:

>>> emerge (1 of 1) net-misc/openssh-3.7.1_p1-r1 to /
>>> md5 src_uri ;-) openssh-3.7.1p1.tar.gz
>>> md5 src_uri ;-) openssh-3.7.1p1+x509g2.diff.gz
>>> Unpacking source...
>>> Unpacking openssh-3.7.1p1.tar.gz to /var/tmp/portage/openssh-3.7.1_p1-r1/work
 * Applying openssh-3.7.1_p1-connect-timeout.patch...                     [ ok ]
 * Applying openssh-3.7.1_p1-double-free.patch...                         [ ok ]
 * Applying openssh-3.7.1_p1-memory-leak.patch...                         [ ok ]
 * Applying openssh-3.7.1_p1-memory-bugs.patch...                         [ ok ]
 * Applying openssh-3.7.1p1+x509g2.diff.gz...

 * Failed Patch: openssh-3.7.1p1+x509g2.diff.gz!
 * 
 * Include in your bugreport the contents of:
 * 
 *  
/var/tmp/portage/openssh-3.7.1_p1-r1/temp/openssh-3.7.1p1+x509g2.diff.gz-9658.out


!!! ERROR: net-misc/openssh-3.7.1_p1-r1 failed.
!!! Function epatch, Line 321, Exitcode 0
!!! Failed Patch: openssh-3.7.1p1+x509g2.diff.gz!

I have attached
/var/tmp/portage/openssh-3.7.1_p1-r1/temp/openssh-3.7.1p1+x509g2.diff.
gz-9658.out where you can see that epatch is using "patch -p0" instead of "patch
-p1"

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




Portage 2.0.49-r4 (default-1.0, gcc-2.95.3, glibc-2.2.5-r8, 2.4.22)
==============================================================
===
System uname: 2.4.22 i686 Transmeta(tm) Crusoe(tm) Processor TM5800
ACCEPT_KEYWORDS="x86 ~x86"
AUTOCLEAN="yes"
CFLAGS="-mcpu=i686 -O3 -pipe"
CHOST="i686-pc-linux-gnu"
COMPILER=""
CONFIG_PROTECT="/etc /var/qmail/control /usr/share/config /usr/kde/2/share/config 
/usr/kde/3/share/config /usr/X11R6/lib/X11/xkb /usr/share/texmf/tex/generic/config/ 
/usr/share/texmf/tex/platex/config/"
CONFIG_PROTECT_MASK="/etc/gconf /etc/env.d"
CXXFLAGS="-mcpu=i686 -O3 -pipe"
DISTDIR="/usr/portage/distfiles"
FEATURES="ccache autoaddcvs digest sandbox strict"
GENTOO_MIRRORS="http://gentoo.oregonstate.edu http://distro.ibiblio.
org/pub/Linux/distributions/gentoo"
MAKEOPTS="-j2"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/local/portage"
SYNC="rsync://rsync.namerica.gentoo.org/gentoo-portage"
USE="x86 apm avi crypt cups encode libg++ mmx mpeg ncurses pdflib quicktime
spell truetype 
xml2 xmms xv aalib berkdb esd gdbm gif gnome-libs gpm gtk imlib java libwww
motif mozilla 
oggvorbis pam python readline sdl snmp ssl svga tcpd -3dnow alsa apache2 -arts
bonobo cdr 
curses dga dvd emacs ethereal evo fbcon gnome gtk2 gtkhtml guile jpeg -kde lcms
-lirc -mikmod 
-moznoxft mysql nas -nls odbc -opengl oss pcmcia pda perl pic plotutils png pnp
-qt -qtmt samba 
skey -slang smooth tcltk tetex tiff trusted usb vim-with-x xml X X509 zlib"

Comment 1 Daniel Ahlberg (RETIRED) gentoo-dev

2003-09-19 06:28:05 UTC

Fixed, some of the cvs patches updated the file id which the X509 patch didn't 
like.