Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 170527 - net-misc/openssh-4.6_p1 patch failed
Summary: net-misc/openssh-4.6_p1 patch failed
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: High normal (vote)
Assignee: Gentoo's Team for Core System packages
URL:
Whiteboard:
Keywords:
: 170579 (view as bug list)
Depends on:
Blocks:
 
Reported: 2007-03-12 02:28 UTC by Heiko Baums
Modified: 2007-03-13 02:26 UTC (History)
4 users (show)

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


Attachments
openssh-4.4_p1-ldap-hpn-glue.patch-337.out (openssh-4.4_p1-ldap-hpn-glue.patch-337.out,2.73 KB, text/plain)
2007-03-12 02:29 UTC, Heiko Baums
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Heiko Baums 2007-03-12 02:28:50 UTC
net-misc/openssh-4.6_p1 can't be emerged due to a patch failure.

>>> Emerging (6 of 18) net-misc/openssh-4.6_p1 to /
 * openssh-4.6p1.tar.gz RMD160 ;-) ...                                                                                                                    [ ok ] * openssh-4.6p1.tar.gz SHA1 ;-) ...                                                                                                                      [ ok ] * openssh-4.6p1.tar.gz SHA256 ;-) ...                                                                                                                    [ ok ] * openssh-4.6p1.tar.gz size ;-) ...                                                                                                                      [ ok ] * checking ebuild checksums ;-) ...                                                                                                                      [ ok ] * checking auxfile checksums ;-) ...                                                                                                                     [ ok ] * checking miscfile checksums ;-) ...                                                                                                                    [ ok ] * checking openssh-4.6p1.tar.gz ;-) ...                                                                                                                  [ ok ]>>> Unpacking source...
>>> Unpacking openssh-4.6p1.tar.gz to /usr/var/portage/net-misc/openssh-4.6_p1/work
 * Applying openssh-4.6_p1-include-string-header.patch ...                                                                                                [ ok ] * Applying various patches (bugfixes/updates) ...
 * Done with patching
 * Applying openssh-4.4_p1-ldap-hpn-glue.patch ...

 * Failed Patch: openssh-4.4_p1-ldap-hpn-glue.patch !
 *  ( /usr/portage/net-misc/openssh/files/openssh-4.4_p1-ldap-hpn-glue.patch )
 *
 * Include in your bugreport the contents of:
 *
 *   /usr/var/portage/net-misc/openssh-4.6_p1/temp/openssh-4.4_p1-ldap-hpn-glue.patch-337.out


!!! ERROR: net-misc/openssh-4.6_p1 failed.
Call stack:
  ebuild.sh, line 1614:   Called dyn_unpack
  ebuild.sh, line 751:   Called qa_call 'src_unpack'
  environment, line 3919:   Called src_unpack
  openssh-4.6_p1.ebuild, line 84:   Called epatch '/usr/var/portage/net-misc/openssh-4.6_p1/distdir/' '/usr/portage/net-misc/openssh/files/openssh-4.4_p1-ldap-hpn-glue.patch'
  eutils.eclass, line 163:   Called epatch '/usr/portage/net-misc/openssh/files/openssh-4.4_p1-ldap-hpn-glue.patch'
  eutils.eclass, line 341:   Called die

!!! Failed Patch: openssh-4.4_p1-ldap-hpn-glue.patch!
!!! If you need support, post the topmost build error, and the call stack if relevant.
!!! A complete build log is located at '/usr/var/portage/net-misc/openssh-4.6_p1/temp/build.log'.


emerge --info:

Portage 2.1.2.2 (default-linux/x86/2006.1/desktop, gcc-4.1.2, glibc-2.5-r0, 2.6.19-gentoo-r5 i686)
=================================================================
System uname: 2.6.19-gentoo-r5 i686 AMD Athlon(tm) XP 1600+
Gentoo Base System release 1.12.9
Timestamp of tree: Mon, 12 Mar 2007 02:00:07 +0000
dev-java/java-config: 1.3.7, 2.0.31-r4
dev-lang/python:     2.4.4
dev-python/pycrypto: 2.0.1-r5
sys-apps/sandbox:    1.2.18.1
sys-devel/autoconf:  2.13, 2.61
sys-devel/automake:  1.4_p6, 1.5, 1.6.3, 1.7.9-r1, 1.8.5-r3, 1.9.6-r2, 1.10
sys-devel/binutils:  2.17
sys-devel/gcc-config: 1.3.15
sys-devel/libtool:   1.5.23b
virtual/os-headers:  2.6.20-r1
ACCEPT_KEYWORDS="x86 ~x86"
AUTOCLEAN="yes"
CBUILD="i686-pc-linux-gnu"
CFLAGS="-march=athlon-xp -O2 -pipe -fomit-frame-pointer"
CHOST="i686-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/kde/3.5/env /usr/kde/3.5/share/config /usr/kde/3.5/shutdown /usr/share/X11/xkb /usr/share/config"
CONFIG_PROTECT_MASK="/etc/env.d /etc/env.d/java/ /etc/gconf /etc/java-config/vms/ /etc/php/apache1-php5/ext-active/ /etc/php/apache2-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/cli-php5/ext-active/ /etc/revdep-rebuild /etc/splash /etc/terminfo /etc/texmf/web2c"
CXXFLAGS="-march=athlon-xp -O2 -pipe -fomit-frame-pointer"
DISTDIR="/usr/portage/distfiles"
FEATURES="autoconfig distlocks metadata-transfer sandbox sfperms strict"
GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/linux/distributions/gentoo"
LANG="de_DE.UTF-8"
LINGUAS="de"
PKGDIR="/usr/portage/packages"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --delete-after --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --filter=H_**/files/digest-*"
PORTAGE_TMPDIR="/usr/var"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/portage/local/layman/sunrise /usr/portage/local/private"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="3dnow 3dnowext X a52 aac aalib accessibility acpi alsa apache2 apm arts asf audiofile avi berkdb bitmap-fonts bluetooth bzip2 cairo caps cdda cddb cdparanoia cdr chardet chipcard cli cracklib crypt cups curl d dbus dga directfb divx dlloader doc dri dv dvb dvd dvdr dvdread eds effects emboss encode expat extrafilters fam fame fbcon ffmpeg firefox flac foomaticdb fortran ftp gcc-libffi gcj gd gdbm geldkarte gif gimp glib glitz gmedia gmp gnutls gpm graphviz gs gstreamer gtk gtk2 gtkhtml hal hbci iconv idn ilbc imagemagick imlib inkjar ipv6 irmc isdnlog jack jack-tmpfs jce jpeg kde ladspa lcms ldap libg++ libnotify libsamplerate lirc live lm_sensors mad mailwrapper mbox mbrola midi mikmod mjpeg mmx mmx2 mmxext mng modplug motif mozilla mp3 mp4 mpeg mplayer musicbrainz mysql mysqli nas ncurses network nls noamazon nptl nptlonly nsplugin ntfs nvidia objc objc++ objc-gc odbc offensive ofx ogg oggvorbis opengl osc oss pam pcre pdf perl php plugin png ppds pppd print python qt qt3 qt3support qt4 quicktime quotes readline real realmedia reflection reiserfs rtc rtsp scanner sdl session slang slideshow smime speex spell spl sqlite sse sse-filters ssl svg svga tcl tcltk tcpd tetex themes theora threads threadsafe tidy tiff tk tokenizer tools truetype truetype-fonts type1-fonts udev unicode usb utempter v4l v4l2 vdr vidix visualization vlm vorbis win32codecs wma wmf wmp x86 xcomposite xine xml xml2 xorg xpm xv xvid yv12 zip zlib zrtp" ALSA_CARDS="emu10k1" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mulaw multi null plug rate route share shm softvol" ELIBC="glibc" INPUT_DEVICES="evdev keyboard mouse" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LINGUAS="de" LIRC_DEVICES="devinput" USERLAND="GNU" VIDEO_CARDS="nvidia v4l"
Unset:  CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LC_ALL, LDFLAGS, MAKEOPTS, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS
Comment 1 Heiko Baums 2007-03-12 02:29:17 UTC
Created attachment 113033 [details]
openssh-4.4_p1-ldap-hpn-glue.patch-337.out
Comment 2 SpanKY gentoo-dev 2007-03-12 07:12:57 UTC
fixed in cvs
Comment 3 Brian Hall 2007-03-12 13:58:30 UTC
This is NOT a good fix, please take it out of "Resolved fixed" state.

The fix for the compile problem completely disables the HPN patch AFAICT. I was using that functionality. After updating from 4.5 to 4.6 I had to disable references to HPN in sshd.conf. Apparently I missed one since I can no longer access one of my servers.

The HPN patch needs to be updated for 4.6 or 4.6 should be masked until it is.

Comment 4 Brian Hall 2007-03-12 14:21:58 UTC
Not sure about the Gentoo patches, but manually applying the patch from the HPN site against openssh 4.6p1 gives two minor rejects that could easily be fixed up by the ebuild: http://www.psc.edu/networking/projects/hpn-ssh/openssh-4.5p1-hpn12v15.diff.gz

# less compat.h.rej
***************
*** 56,61 ****
  #define SSH_BUG_PROBE         0x00400000
  #define SSH_BUG_FIRSTKEX      0x00800000
  #define SSH_OLD_FORWARD_ADDR  0x01000000

  void     enable_compat13(void);
  void     enable_compat20(void);
--- 56,62 ----
  #define SSH_BUG_PROBE         0x00400000
  #define SSH_BUG_FIRSTKEX      0x00800000
  #define SSH_OLD_FORWARD_ADDR  0x01000000
+ #define SSH_BUG_LARGEWINDOW     0x02000000

  void     enable_compat13(void);
  void     enable_compat20(void);


# less clientloop.c.rej
***************
*** 900,910 ****

        set_nonblock(client_fd);

-       c = channel_new("session", SSH_CHANNEL_OPENING,
-           new_fd[0], new_fd[1], new_fd[2],
-           CHAN_SES_WINDOW_DEFAULT, CHAN_SES_PACKET_DEFAULT,
-           CHAN_EXTENDED_WRITE, "client-session", /*nonblock*/0);
-
        /* XXX */
        c->ctl_fd = client_fd;

--- 936,951 ----

        set_nonblock(client_fd);

+       if (options.hpn_disabled)
+               c = channel_new("session", SSH_CHANNEL_OPENING,
+                   new_fd[0], new_fd[1], new_fd[2],
+                   CHAN_SES_WINDOW_DEFAULT, CHAN_SES_PACKET_DEFAULT,
+                   CHAN_EXTENDED_WRITE, "client-session", /*nonblock*/0);
+       else
+               c = channel_new("session", SSH_CHANNEL_OPENING,
+                   new_fd[0], new_fd[1], new_fd[2],
+                   options.hpn_buffer_size, CHAN_SES_PACKET_DEFAULT,
+                   CHAN_EXTENDED_WRITE, "client-session", /*nonblock*/0);
        /* XXX */
        c->ctl_fd = client_fd;
Comment 5 Jakub Moc (RETIRED) gentoo-dev 2007-03-12 15:28:47 UTC
*** Bug 170579 has been marked as a duplicate of this bug. ***
Comment 6 Jakub Moc (RETIRED) gentoo-dev 2007-03-12 15:29:02 UTC
Fix no workie...
Comment 7 SpanKY gentoo-dev 2007-03-12 16:31:56 UTC
it is fixed, what these people are complaining about is completely different and frankly, i could care less about ... if you guys want updated versions of hpn/ldap/whatever, talk to upstream to get them updated to 4.6_p1
Comment 8 Brian Hall 2007-03-12 19:27:35 UTC
Here is the updated HPN patch for 4.6p1, please update:

http://www.psc.edu/networking/projects/hpn-ssh/openssh-4.6p1-hpn12v16.diff.gz


Comment 9 SpanKY gentoo-dev 2007-03-13 02:26:34 UTC
the way we use bugzilla is every issue gets a separate bug report

updated hpn support is a different issue from not being able to apply a patch with USE=ldap

openssh-4.6_p1-r1 should be in shortly with updated hpn