* Applying pax.patch ... [ ok ] * Applying pax-2.patch ... * Failed Patch: pax-2.patch ! * ( /usr/portage/sys-fs/aufs3/files/pax-2.patch ) * * Include in your bugreport the contents of: * * /var/tmp/paludis/sys-fs-aufs3-3_p20121015-r1/temp//pax-2.patch.out PATCH COMMAND: patch -p1 -g0 -E --no-backup-if-mismatch < '/usr/portage/sys-fs/aufs3/files/pax-2.patch' ======================= patching file fs/aufs/dynop.c Hunk #1 FAILED at 149. Hunk #2 FAILED at 159. Hunk #3 FAILED at 266. 3 out of 3 hunks FAILED -- saving rejects to file fs/aufs/dynop.c.rej patching file fs/aufs/f_op_sp.c patching file fs/aufs/branch.h patch program exited with status 1 Reproducible: Always
I bumped on this bug too. pax-2.patch can't be applied at least on 3.6.2 and 3.6.3 hardened-sources.
Confirm for hardened-3.4.9
(In reply to comment #2) > Confirm for hardened-3.4.9 I meant gentoo-sources-3.4.9. Sorry for the noise.
Created attachment 328618 [details] epatch fix for aufs3-3_p20121015-r1.ebuild The problem is that the pax-2.patch is applied on top of the old "pax.patch" when it should instead replace it. Try applying the pax-2.patch manually to verify, or use the attached ebuild instead. The following line in the ebuild: use pax_kernel && epatch "${FILESDIR}"/pax.patch "${FILESDIR}"/pax-2.patch should be replaced with this: use pax_kernel && epatch "${FILESDIR}"/pax-2.patch ... which is the only the change in the attached ebuild (compared to aufs3-3_p20121015-r1.ebuild)
BTW, the pax-2.patch applies cleanly to all aufs3 3.x releases thus far. I just tested it successively against every branch in the aufs3 git tree. The reports here aren't related to kernel versions.
no fix in aufs3-3_p20121112
Maybe this bug could be assigned to the maintainer of aufs3 ebuild instead of the hardened team?
+ 14 Nov 2012; Justin Lecher <jlec@gentoo.org> aufs3-3_p20121015-r1.ebuild, + aufs3-3_p20121112.ebuild: + Do not apply the old hardened patch +
