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.
Created attachment 8220 [details] epatch log file
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
works like a charm :) thanks Az :)
