Bug 354637 – epatch fails with particular patch

• Product: Gentoo Infrastructure
• Status: RESOLVED INVALID

[Description Max Arnold 2011-02-12 18:38:41 UTC]

I have a custom patch to ejabberd which can not be applied by epatch. It tries all possible -p options and then fails. If I remove doc/guide.tex patch section, it applies just fine. Also it perfectly applies manually.

Reproducible: Always

Steps to Reproduce:
Add attached patch to ejabberd-2.1.5 ebuild and emerge it.
Actual Results:  
 * Failed Patch: inet-dist-interface.patch !
 *  ( /usr/local/portage/custom/net-im/ejabberd/files/inet-dist-interface.patch )


patch.out contains:

***** inet-dist-interface.patch *****

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

PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch < '/usr/local/portage/custom/net-im/ejabberd/files/inet-dist-interface.patch'

=====================================
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
....
PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch < '/usr/local/portage/custom/net-im/ejabberd/files/inet-dist-interface.patch'

=====================================
can't find file to patch at input line 4
...
PATCH COMMAND:  patch -p2 -g0 -E --no-backup-if-mismatch < '/usr/local/portage/custom/net-im/ejabberd/files/inet-dist-interface.patch'

=====================================
...
etc

Expected Results:  
Patch looks valid and should be applied by epatch.

Portage 2.1.9.25 (default/linux/x86/10.0, gcc-4.4.4, glibc-2.11.2-r3, 2.6.36-gentoo-r5-2011-01-10 i686)
=================================================================
System uname: Linux-2.6.36-gentoo-r5-2011-01-10-i686-Intel-R-_Xeon-R-_CPU_E5430_@_2.66GHz-with-gentoo-1.12.14
Timestamp of tree: Mon, 10 Jan 2011 01:45:01 +0000
app-shells/bash:     4.1_p7
dev-java/java-config: 2.1.11-r1
dev-lang/python:     2.6.6-r1, 3.1.2-r4
sys-apps/baselayout: 1.12.14-r1
sys-apps/sandbox:    2.4
sys-devel/autoconf:  2.65-r1
sys-devel/automake:  1.11.1
sys-devel/binutils:  2.20.1-r1
sys-devel/gcc:       4.4.4-r2
sys-devel/gcc-config: 1.4.1
sys-devel/libtool:   2.2.10
sys-devel/make:      3.81-r2
virtual/os-headers:  2.6.30-r1 (sys-kernel/linux-headers)
ACCEPT_KEYWORDS="x86"
ACCEPT_LICENSE="*"
CBUILD="i686-pc-linux-gnu"
CFLAGS="-O2 -march=i686 -pipe -fomit-frame-pointer -mno-tls-direct-seg-refs"
CHOST="i686-pc-linux-gnu"
CONFIG_PROTECT="/etc"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/env.d/java/ /etc/gconf /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo"
CXXFLAGS="-O2 -march=i686 -pipe -fomit-frame-pointer -mno-tls-direct-seg-refs"
DISTDIR="/data/distfiles"
FEATURES="assume-digests binpkg-logs distlocks fixlafiles fixpackages news protect-owned sandbox sfperms strict unknown-features-warn unmerge-logs unmerge-orphans userfetch"
GENTOO_MIRRORS="http://mirror.yandex.ru/gentoo-distfiles/ http://distfiles.gentoo.org/"
LANG="ru_RU.UTF-8"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
LINGUAS="ru en"
MAKEOPTS="-j2"
PKGDIR="/data/packages"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/local/portage/custom /usr/local/portage/update /usr/local/portage/bugzilla /usr/local/portage/misc"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="acl berkdb bzip2 cli crypt cxx dri fortran gdbm gpm iconv lzma mmx modules mudflap ncurses nls nptl nptlonly openmp pam pcre pppd python readline session sse sse2 ssl sysfs unicode x86 xorg zlib" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1 emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null plug rate route share shm softvol" APACHE2_MODULES="actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ubx" INPUT_DEVICES="keyboard mouse evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LINGUAS="ru en" PHP_TARGETS="php5-3" RUBY_TARGETS="ruby18" USERLAND="GNU" VIDEO_CARDS="fbdev glint intel mach64 mga neomagic nouveau nv r128 radeon savage sis tdfx trident vesa via vmware dummy v4l" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account" 
Unset:  CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, FFLAGS, INSTALL_MASK, LC_ALL, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS

[Comment 1 Max Arnold 2011-02-12 18:43:20 UTC]

Created attachment 262263 [details, diff]
problematic patch (against ejabberd 2.1.5)

[Comment 2 Max Arnold 2011-02-14 05:04:33 UTC]

Sorry for noise. I missed the fact that ebuild sets source root to nested directory: S=${WORKDIR}/${P}/src