15613 2003-02-13 03:37 0000 epatch has funny output and false failure 2003-02-18 03:21:06 0000 1 1 1 Unclassified Gentoo Linux Ebuilds 1.4_rc2 All Linux RESOLVED FIXED P2 normal 1.4 1 seemant@gentoo.org azarah@gentoo.org seemant@gentoo.org 2003-02-13 03:37:24 0000 hi Az, patch -p1 < ${WORKDIR}/djbdns-1.05-gentoo.diff || die gives you: patching file FILES patching file Makefile Hunk #5 succeeded at 329 (offset 4 lines). Hunk #7 succeeded at 419 (offset 4 lines). Hunk #9 succeeded at 534 (offset 4 lines). Hunk #11 succeeded at 688 (offset 4 lines). Hunk #13 succeeded at 766 (offset 4 lines). Hunk #15 succeeded at 840 (offset 4 lines). Hunk #17 succeeded at 890 (offset 4 lines). Hunk #19 succeeded at 1086 (offset 4 lines). Hunk #21 succeeded at 1175 (offset 4 lines). Hunk #23 succeeded at 1217 (offset 4 lines). patching file TARGETS patching file axfr-get.c patching file dns.h Hunk #2 succeeded at 44 with fuzz 1. Hunk #3 succeeded at 71 (offset 1 line). patching file dns_ip6.c patching file dns_ipq6.c patching file dns_name.c patching file dns_nd6.c patching file dns_rcip.c patching file dns_resolve.c patching file dns_sortip6.c patching file dns_transmit.c patching file dnscache.c patching file dnscache.c~ patching file dnsfilter.c patching file dnsip6.c patching file dnsip6q.c patching file dnsname.c patching file dnsq.c patching file fmt_xlong.c patching file haveip6.h1 patching file haveip6.h2 patching file haven2i.h1 patching file haven2i.h2 patching file hier.c patching file ip6.h patching file ip6_fmt.c patching file ip6_scan.c patching file log.c patching file okclient.c patching file printrecord.c patching file qlog.c patching file query.c patching file query.h patching file roots.c patching file scan_xlong.c patching file server.c patching file sockaddr_in6.h1 patching file sockaddr_in6.h2 patching file socket.h patching file socket_accept6.c patching file socket_bind.c patching file socket_bind6.c patching file socket_connect6.c patching file socket_getifidx.c patching file socket_noipv6.c patching file socket_recv6.c patching file socket_send6.c patching file socket_tcp6.c patching file socket_udp6.c patching file tdlookup.c patching file tinydns-conf.c patching file tinydns-data.c patching file tinydns-edit.c patching file tryip6.c patching file tryn2i.c patching file trysa6.c patching file Makefile Hunk #1 succeeded at 336 (offset 4 lines). Hunk #3 succeeded at 875 (offset 4 lines). Hunk #5 succeeded at 895 (offset 4 lines). Hunk #7 succeeded at 911 (offset 4 lines). >>> Source unpacked. where as: epatch ${WORKDIR}/djbdns-1.05-gentoo.diff gives you: * Applying djbdns-1.05-ipv6-gentoo.diff... /usr/sbin/ebuild.sh: line 1111: 8440 Aborted patch ${popts} --dry-run -f -p${count} <${PATCH_TARGET} >>${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 /usr/sbin/ebuild.sh: line 1111: 8451 Aborted patch ${popts} --dry-run -f -p${count} <${PATCH_TARGET} >>${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 /usr/sbin/ebuild.sh: line 1111: 8462 Aborted patch ${popts} --dry-run -f -p${count} <${PATCH_TARGET} >>${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 * Failed Patch: djbdns-1.05-ipv6-gentoo.diff! * * Include in your bugreport the contents of: * * /var/tmp/portage/djbdns-1.05-r6/temp/djbdns-1.05-ipv6-gentoo.diff-8305.out !!! ERROR: net-dns/djbdns-1.05-r6 failed. !!! Function epatch, Line 302, Exitcode 0 !!! Failed Patch: djbdns-1.05-ipv6-gentoo.diff! I'll attach the log file that it claims. seemant@gentoo.org 2003-02-13 03:38:42 0000 Created an attachment (id=8220) epatch log file azarah@gentoo.org 2003-02-16 15:17:01 0000 Ok, known quirk of patch. If you did for example the same with the '--dry-run' added, you would have gotten the mess to the bottom. This is caused by the fact that the author of the patch prob added additional 'hunks' to Makefile at the bottom of the patch that need some of the previous 'hunks'. Because these changes are not commited, the dry-run fails. I have however fixed epatch to handle this cases better. You should get it in cvs revision 1.19 of eutils.eclass. To fix this whole problem, you will have to regen this patch. ------------------------------------------------------------------------------ nosferatu djbdns-1.05 # patch --dry-run -p1 <../djbdns-1.05-ipv6-gentoo.diff patching file FILES patching file Makefile Hunk #5 succeeded at 329 (offset 4 lines). Hunk #7 succeeded at 419 (offset 4 lines). Hunk #9 succeeded at 534 (offset 4 lines). Hunk #11 succeeded at 688 (offset 4 lines). Hunk #13 succeeded at 766 (offset 4 lines). Hunk #15 succeeded at 840 (offset 4 lines). Hunk #17 succeeded at 890 (offset 4 lines). Hunk #19 succeeded at 1086 (offset 4 lines). Hunk #21 succeeded at 1175 (offset 4 lines). Hunk #23 succeeded at 1217 (offset 4 lines). patching file TARGETS patching file axfr-get.c patching file dns.h Hunk #2 succeeded at 44 with fuzz 1. Hunk #3 succeeded at 71 (offset 1 line). patching file dns_ip6.c patching file dns_ipq6.c patching file dns_name.c patching file dns_nd6.c patching file dns_rcip.c patching file dns_resolve.c patching file dns_sortip6.c patching file dns_transmit.c patching file dnscache.c patching file dnscache.c~ patching file dnsfilter.c patching file dnsip6.c patching file dnsip6q.c patching file dnsname.c patching file dnsq.c patching file fmt_xlong.c patching file haveip6.h1 patching file haveip6.h2 patching file haven2i.h1 patching file haven2i.h2 patching file hier.c patching file ip6.h patching file ip6_fmt.c patching file ip6_scan.c patching file log.c patching file okclient.c patching file printrecord.c patching file qlog.c patching file query.c patching file query.h patching file roots.c patching file scan_xlong.c patching file server.c patching file sockaddr_in6.h1 patching file sockaddr_in6.h2 patching file socket.h patching file socket_accept6.c patching file socket_bind.c patching file socket_bind6.c patching file socket_connect6.c patching file socket_getifidx.c patching file socket_noipv6.c patching file socket_recv6.c patching file socket_send6.c patching file socket_tcp6.c patching file socket_udp6.c patching file tdlookup.c patching file tinydns-conf.c patching file tinydns-data.c patching file tinydns-edit.c patching file tryip6.c patching file tryn2i.c patching file trysa6.c patching file Makefile Hunk #1 succeeded at 312 (offset -20 lines). Hunk #2 FAILED at 835. Hunk #3 succeeded at 825 with fuzz 1 (offset -46 lines). Hunk #4 succeeded at 855 with fuzz 1 (offset -24 lines). Hunk #5 succeeded at 841 with fuzz 1 (offset -50 lines). Hunk #6 succeeded at 871 with fuzz 1 (offset -28 lines). Hunk #7 succeeded at 853 with fuzz 1 (offset -54 lines). 1 out of 7 hunks FAILED -- saving rejects to file Makefile.rej seemant@gentoo.org 2003-02-18 03:21:06 0000 works like a charm :) thanks Az :) 8220 2003-02-13 03:38 0000 epatch log file djbdns-1.05-ipv6-gentoo.diff-8305.out.bz2 application/octet-stream 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 pu/Nei6hS7F/+LuSKcKEhGJOsyg=