Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 603610 - net-misc/openssh-7.4_p1[X509]: patches don't apply
Summary: net-misc/openssh-7.4_p1[X509]: patches don't apply
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Gentoo's Team for Core System packages
URL: http://www.roumenpetrov.info/pipermai...
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2016-12-23 19:02 UTC by Conrad Kostecki
Modified: 2016-12-24 08:05 UTC (History)
1 user (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 Conrad Kostecki gentoo-dev 2016-12-23 19:02:41 UTC
>>> Preparing source in /var/tmp/portage/net-misc/openssh-7.4_p1/work/openssh-7.4p1 ...
 * Applying openssh-7.3_p1-sctp-x509-glue.patch ...

 * Failed Patch: openssh-7.3_p1-sctp-x509-glue.patch !
 *  ( /usr/portage/net-misc/openssh/files/openssh-7.3_p1-sctp-x509-glue.patch )
 * 
 * Include in your bugreport the contents of:
 * 
 *   /var/tmp/portage/net-misc/openssh-7.4_p1/temp/openssh-7.3_p1-sctp-x509-glue.patch.out

 * ERROR: net-misc/openssh-7.4_p1::gentoo failed (prepare phase):
 *   Failed Patch: openssh-7.3_p1-sctp-x509-glue.patch!
 * 
 * Call stack:
 *     ebuild.sh, line  115:  Called src_prepare
 *   environment, line 3919:  Called epatch '/usr/portage/net-misc/openssh/files/openssh-7.3_p1-sctp-x509-glue.patch'
 *   environment, line 2087:  Called die
 * The specific snippet of code:
 *               die "Failed Patch: ${patchname}!";
 * 
 * If you need support, post the output of `emerge --info '=net-misc/openssh-7.4_p1::gentoo'`,
 * the complete build log and the output of `emerge -pqv '=net-misc/openssh-7.4_p1::gentoo'`.
 * The complete build log is located at '/var/tmp/portage/net-misc/openssh-7.4_p1/temp/build.log'.
 * The ebuild environment file is located at '/var/tmp/portage/net-misc/openssh-7.4_p1/temp/environment'.
 * Working directory: '/var/tmp/portage/net-misc/openssh-7.4_p1/work'
 * S: '/var/tmp/portage/net-misc/openssh-7.4_p1/work/openssh-7.4p1'
Comment 1 Conrad Kostecki gentoo-dev 2016-12-23 19:03:24 UTC
***** openssh-7.3_p1-sctp-x509-glue.patch *****
PWD: /var/tmp/portage/net-misc/openssh-7.4_p1/work
PATCH TOOL: patch -> /usr/bin/patch
VERSION INFO:
GNU patch 2.7.5
Copyright (C) 2003, 2009-2012 Free Software Foundation, Inc.
Copyright (C) 1988 Larry Wall

License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.

Written by Larry Wall and Paul Eggert

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

PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/usr/portage/net-misc/openssh/files/openssh-7.3_p1-sctp-x509-glue.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:
--------------------------
|--- a/openssh-7.3_p1-sctp.patch        2016-08-03 13:10:15.733228732 -0700
|+++ b/openssh-7.3_p1-sctp.patch        2016-08-03 13:25:53.274630002 -0700
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored

patch program exited with status 1
===============================================

PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/usr/portage/net-misc/openssh/files/openssh-7.3_p1-sctp-x509-glue.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:
--------------------------
|--- a/openssh-7.3_p1-sctp.patch        2016-08-03 13:10:15.733228732 -0700
|+++ b/openssh-7.3_p1-sctp.patch        2016-08-03 13:25:53.274630002 -0700
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored

patch program exited with status 1
===============================================

PATCH COMMAND:  patch -p2 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/usr/portage/net-misc/openssh/files/openssh-7.3_p1-sctp-x509-glue.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:
--------------------------
|--- a/openssh-7.3_p1-sctp.patch        2016-08-03 13:10:15.733228732 -0700
|+++ b/openssh-7.3_p1-sctp.patch        2016-08-03 13:25:53.274630002 -0700
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored

patch program exited with status 1
===============================================

PATCH COMMAND:  patch -p3 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/usr/portage/net-misc/openssh/files/openssh-7.3_p1-sctp-x509-glue.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:
--------------------------
|--- a/openssh-7.3_p1-sctp.patch        2016-08-03 13:10:15.733228732 -0700
|+++ b/openssh-7.3_p1-sctp.patch        2016-08-03 13:25:53.274630002 -0700
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored

patch program exited with status 1
===============================================

PATCH COMMAND:  patch -p4 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/usr/portage/net-misc/openssh/files/openssh-7.3_p1-sctp-x509-glue.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:
--------------------------
|--- a/openssh-7.3_p1-sctp.patch        2016-08-03 13:10:15.733228732 -0700
|+++ b/openssh-7.3_p1-sctp.patch        2016-08-03 13:25:53.274630002 -0700
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored

patch program exited with status 1
Comment 2 Conrad Kostecki gentoo-dev 2016-12-23 19:04:18 UTC
Portage 2.3.3 (python 3.5.2-final-0, default/linux/amd64/13.0, gcc-5.4.0, glibc-2.23-r3, 4.9.0-gentoo x86_64)
=================================================================
System uname: Linux-4.9.0-gentoo-x86_64-Intel-R-_Atom-TM-_CPU_C2758_@_2.40GHz-with-gentoo-2.3
KiB Swap:   36700156 total,  36700156 free
Timestamp of repository gentoo: Fri, 23 Dec 2016 17:15:01 +0000
sh bash 4.4_p5-r1
ld GNU ld (Gentoo 2.27 p1.0) 2.27
distcc 3.2rc1 x86_64-pc-linux-gnu [disabled]
ccache version 3.3.3 [enabled]
app-shells/bash:          4.4_p5-r1::gentoo
dev-java/java-config:     2.2.0-r3::gentoo
dev-lang/perl:            5.24.1_rc4::gentoo
dev-lang/python:          2.7.12::gentoo, 3.4.5::gentoo, 3.5.2::gentoo
dev-util/ccache:          3.3.3::gentoo
dev-util/cmake:           3.7.1::gentoo
dev-util/pkgconfig:       0.29.1::gentoo
sys-apps/baselayout:      2.3::gentoo
sys-apps/openrc:          0.23::gentoo
sys-apps/sandbox:         2.10-r2::gentoo
sys-devel/autoconf:       2.13::gentoo, 2.69-r2::gentoo
sys-devel/automake:       1.11.6-r2::gentoo, 1.13.4-r1::gentoo, 1.14.1-r1::gentoo, 1.15-r2::gentoo
sys-devel/binutils:       2.27::gentoo
sys-devel/gcc:            5.4.0::gentoo
sys-devel/gcc-config:     1.8-r1::gentoo
sys-devel/libtool:        2.4.6-r2::gentoo
sys-devel/make:           4.2.1::gentoo
sys-kernel/linux-headers: 4.9::gentoo (virtual/os-headers)
sys-libs/glibc:           2.23-r3::gentoo
Repositories:

gentoo
    location: /usr/portage
    sync-type: rsync
    sync-uri: rsync://rsync.de.gentoo.org/gentoo-portage
    priority: -1000
    sync-rsync-extra-opts: --exclude-from=/etc/portage/rsync_excludes

galactica
    location: /usr/local/portage
    masters: gentoo

ACCEPT_KEYWORDS="amd64 ~amd64"
ACCEPT_LICENSE="*"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-march=native -mfpmath=sse,387 -mtune=intel -O3 -fomit-frame-pointer -malign-data=abi -mtls-dialect=gnu2 -pipe"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /etc/stunnel/stunnel.conf /usr/share/gnupg/qualified.txt /var/lib/pyload /var/lib/slimserver/prefs /var/lib/unifi/data/system.properties"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/dconf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/gentoo-release /etc/php/apache2-php7.1/ext-active/ /etc/php/cgi-php7.1/ext-active/ /etc/php/cli-php7.1/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/splash /etc/terminfo"
CXXFLAGS="-march=native -mfpmath=sse,387 -mtune=intel -O3 -fomit-frame-pointer -malign-data=abi -mtls-dialect=gnu2 -pipe -fvisibility-inlines-hidden"
DISTDIR="/usr/portage/distfiles"
EMERGE_DEFAULT_OPTS="--autounmask=n --quiet-build=n --with-bdeps=y"
FCFLAGS="-O2 -pipe"
FEATURES="assume-digests binpkg-logs ccache config-protect-if-modified distlocks ebuild-locks fixlafiles merge-sync news parallel-fetch protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox usersync xattr"
FFLAGS="-O2 -pipe"
GENTOO_MIRRORS="ftp://ftp.halifax.rwth-aachen.de/gentoo/"
INSTALL_MASK="/etc/xinetd.d/* /usr/lib/systemd/system/*"
LANG="de_DE.utf8"
LC_ALL="de_DE.utf8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed -Wl,--sort-common -Wl,-z,now"
MAKEOPTS="-j9 -l8"
PKGDIR="/usr/portage/packages"
PORTAGE_BUNZIP2_COMMAND="pbunzip2"
PORTAGE_BZIP2_COMMAND="pbzip2"
PORTAGE_COMPRESS="xz"
PORTAGE_COMPRESS_FLAGS="-9e"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_EXTRA_OPTS="--exclude-from=/etc/portage/rsync_excludes"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --omit-dir-times --compress --force --whole-file --delete --stats --human-readable --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --exclude=/.git"
PORTAGE_TMPDIR="/var/tmp"
USE="X aac acl alsa amd64 berkdb bzip2 cairo caps cddb cgi cjk cracklib crypt ctype curl cvs cxx dbus djvu encode exif ffmpeg flite fontconfig ftp gd gif git gmp gnutls gpm graphviz hddtemp iconv icu idn imlib inotify introspection ipv6 javascript jit jpeg jpeg2k lcms libcaca libsamplerate lm_sensors lzma lzo maildir mbox mhash mikmod mime mmap modplug mp3 mysql mysqli ncurses nls nntp nptl offensive ogg openal opencl opengl openmp orc oss pam pcre pdf perl png posix postproc postscript pulseaudio python raw readline samba seccomp session simplexml slang sndfile sockets spell sqlite ssl subversion suid svg symlink syslog tcpd theora threads tiff truetype udev unicode usb vaapi vdpau vhosts vim-syntax vorbis wavpack webp wmf x264 xattr xcb xml xmp xpm xvid zeroconf zlib zsh-completion" ABI_X86="32 64" COLLECTD_PLUGINS="apcups cgroups conntrack contextswitch cpu cpusleep df disk dns entropy ethstat exec filecount hddtemp interface ipc ipmi irq load lvm md memory mysql netlink nfs nginx ntpd openvpn ping processes protocols rrdcached sensors serial smart swap syslog tcpconns thermal unixsock uptime users" CPU_FLAGS_X86="aes mmx mmxext sse sse2 sse3 ssse3 sse4_1 sse4_2" CURL_SSL="openssl" ELIBC="glibc" GRUB_PLATFORMS="pc" INPUT_DEVICES="libinput" KERNEL="linux" L10N="de de_DE" LCD_DEVICES="crystalfontz lcd2usb" LINGUAS="de de_DE" NGINX_MODULES_HTTP="access auth_basic autoindex charset fancyindex fastcgi geo geoip gunzip gzip proxy realip rewrite stub_status upstream_keepalive" NGINX_MODULES_STREAM="access geo geoip realip ssl_preread" PHP_TARGETS="php7-1" PYTHON_SINGLE_TARGET="python3_5" PYTHON_TARGETS="python2_7 python3_4 python3_5" USERLAND="GNU" VIDEO_CARDS="ast"
USE_PYTHON="2.7 3.4 3.5"
Unset:  CC, CPPFLAGS, CTARGET, CXX
Comment 3 SpanKY gentoo-dev 2016-12-24 07:48:05 UTC
looks like i forgot to test the USE=X509 path.  and looking at upstream's patch again, i'm reminded at what a terrible job they do.  they've decided to re-add ssh1 support.

we really need to figure out a way to cut out upstream's stupid crap and distill down just the x509 cert support.
Comment 4 SpanKY gentoo-dev 2016-12-24 08:05:38 UTC
screw it.  upstream is too incompetent and refuses to change.  i've changed USE=X509 to not work with hpn or sctp.

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02381c768910f0ac57d397a8b199761cadac8616