On an SELinux-enabled system, findutils-4.3.12 fails while trying to apply a patch from 4.3.11. Reproducible: Always Steps to Reproduce: 1. Use an SELinux profile (e.g. selinux/2007.0/x86) 2. Attempt to emerge findutils-4.3.12 Actual Results: >>> Unpacking source... >>> Unpacking findutils-4.3.12.tar.gz to /var/tmp/portage/sys-apps/findutils-4.3.12/work * Applying findutils-4.3.11-selinux.diff ... * Failed Patch: findutils-4.3.11-selinux.diff ! * ( /usr/portage/sys-apps/findutils/files/findutils-4.3.11-selinux.diff ) Portage 2.1.4 (selinux/2007.0/x86, gcc-4.2.2, glibc-2.7-r1, 2.6.22-hardened-r2 i686) ================================================================= System uname: 2.6.22-hardened-r2 i686 AMD Athlon(TM) XP 2100+ Timestamp of tree: Wed, 30 Jan 2008 07:00:01 +0000 app-shells/bash: 3.2_p33 dev-java/java-config: 1.3.7, 2.1.4 dev-lang/python: 2.5.1-r5 sys-apps/baselayout: 1.12.11.1 sys-apps/sandbox: 1.2.18.1-r2 sys-devel/autoconf: 2.13, 2.61-r1 sys-devel/automake: 1.7.9-r1, 1.8.5-r3, 1.9.6-r2, 1.10.1 sys-devel/binutils: 2.18-r1 sys-devel/gcc-config: 1.4.0-r4 sys-devel/libtool: 1.5.24 virtual/os-headers: 2.6.24 ACCEPT_KEYWORDS="x86 ~x86" CBUILD="i686-pc-linux-gnu" CFLAGS="-march=athlon-xp -O2 -pipe" CHOST="i686-pc-linux-gnu" CONFIG_PROTECT="/etc" CONFIG_PROTECT_MASK="/etc/env.d /etc/env.d/java/ /etc/fonts/fonts.conf /etc/gconf /etc/revdep-rebuild /etc/terminfo /etc/udev/rules.d" CXXFLAGS="-march=athlon-xp -O2 -pipe" DISTDIR="/usr/portage/distfiles" FEATURES="distlocks loadpolicy metadata-transfer sandbox selinux sesandbox sfperms strict unmerge-orphans userfetch" GENTOO_MIRRORS="http://distfiles.gentoo.org http://distro.ibiblio.org/pub/linux/distributions/gentoo" MAKEOPTS="-j2" PKGDIR="/usr/portage/packages" PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --stats --timeout=180 --exclude=/distfiles --exclude=/local --exclude=/packages --filter=H_**/files/digest-*" PORTAGE_TMPDIR="/var/tmp" PORTDIR="/usr/portage" SYNC="rsync://rsync.gentoo.org/gentoo-portage" USE="X alsa bash-completion berkdb bzip2 cracklib crypt curses dri firefox gnome gtk gtk2 jpeg mad mmx mp3 mpeg mysql nptl nptlonly opengl pam perl png python readline selinux sse sse2 ssl tcpd threads vim-syntax x86 xorg zlib" ALSA_CARDS="via82xx" ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter 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 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" ELIBC="glibc" INPUT_DEVICES="keyboard mouse" KERNEL="linux" USERLAND="GNU" VIDEO_CARDS="nvidia vga" Unset: CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LANG, LC_ALL, LDFLAGS, LINGUAS, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, PORTDIR_OVERLAY
Created attachment 142206 [details] Output of patch attempt The problem appears to be limited to the man page, but my ebuild-fu isn't yet good enough to fix the problem. The next attachment was my attempt to generate a new patch, but it still fails.
Created attachment 142207 [details, diff] Attempt to update 4.3.11-selinux.diff The problem with the 4.3.11 patch appear isolated to the man page: the line numbers have shifted down too far for patch to figure it out. This is an attempt to fix the problem: the new patch for find.1 works by itself but fails when I integrate it with all the other patches, and I == confused.
fixed yesterday
