Bug 315759

Summary:	sys-apps/findutils-4.4.2 - findutils-4.3.12-selinux.diff fails to apply
Product:	Gentoo Linux	Reporter:	Jonathan Barnard <WineLauncher.Jonathan>
Component:	Current packages	Assignee:	Chris PeBenito (RETIRED) <pebenito>
Status:	RESOLVED FIXED
Severity:	normal	CC:	gizmo, kronenpj, lkml_ccc, rkelley
Priority:	High
Version:	unspecified
Hardware:	All
OS:	Linux
Whiteboard:
Package list:		Runtime testing required:	---
Bug Depends on:
Bug Blocks:	314035
Attachments:	findutils-4.3.12-selinux.diff.out ebuild environment build log findutils 4.3.12 selinux diff output The Build Log diff Selinux patch for findutils 4.4.2 Patch to update findutils ebuild to use new selinux patch Same as previous selinux patch, but with more context info Same as previous selinux patch, but with more context info emerge --info

Description Jonathan Barnard 2010-04-17 16:17:26 UTC

* Failed Patch: findutils-4.3.12-selinux.diff !
 *  ( /usr/portage/sys-apps/findutils/files/findutils-4.3.12-selinux.diff )
 * 
 * Include in your bugreport the contents of:
 * 
 *   /dev/shm/portage/sys-apps/findutils-4.4.2/temp/findutils-4.3.12-selinux.diff.out

 * ERROR: sys-apps/findutils-4.4.2 failed:
 *   Failed Patch: findutils-4.3.12-selinux.diff!
 * 
 * Call stack:
 *     ebuild.sh, line   54:  Called src_unpack
 *   environment, line 2664:  Called epatch '/usr/portage/sys-apps/findutils/files/findutils-4.3.12-selinux.diff'
 *   environment, line 1271:  Called die
 * The specific snippet of code:
 *               die "Failed Patch: ${patchname}!";
 * 
 * If you need support, post the output of 'emerge --info =sys-apps/findutils-4.4.2',
 * the complete build log and the output of 'emerge -pqv =sys-apps/findutils-4.4.2'.
 * The complete build log is located at '/dev/shm/portage/sys-apps/findutils-4.4.2/temp/build.log'.
 * The ebuild environment file is located at '/dev/shm/portage/sys-apps/findutils-4.4.2/temp/environment'.
 * S: '/dev/shm/portage/sys-apps/findutils-4.4.2/work/findutils-4.4.2'

Comment 1 Jonathan Barnard 2010-04-17 16:18:22 UTC

Created attachment 228181 [details]
findutils-4.3.12-selinux.diff.out

Comment 2 Jonathan Barnard 2010-04-17 16:20:39 UTC

Portage 2.1.8.3 (selinux/v2refpolicy/amd64, gcc-4.3.4, glibc-2.10.1-r1, 2.6.31-gentoo-r10-me-r2 x86_64)
=================================================================
System uname: Linux-2.6.31-gentoo-r10-me-r2-x86_64-AMD_Athlon-tm-_7750_Dual-Core_Processor-with-gentoo-1.12.13
Timestamp of tree: Sat, 17 Apr 2010 16:00:02 +0000
distcc 3.1 x86_64-pc-linux-gnu [disabled]
ccache version 2.4 [enabled]
app-shells/bash:     4.0_p37
dev-lang/python:     2.6.4-r1
dev-util/ccache:     2.4-r7
dev-util/cmake:      2.6.4-r3
sys-apps/baselayout: 1.12.13
sys-apps/sandbox:    1.6-r2
sys-devel/autoconf:  2.13, 2.63-r1
sys-devel/automake:  1.8.5-r4, 1.9.6-r3, 1.10.3, 1.11.1
sys-devel/binutils:  2.19.1-r1
sys-devel/gcc:       4.3.4
sys-devel/gcc-config: 1.4.1
sys-devel/libtool:   2.2.6b
virtual/os-headers:  2.6.30-r1
ACCEPT_KEYWORDS="amd64"
ACCEPT_LICENSE="* -@EULA LOKI-EULA"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-march=amdfam10 -O2 -pipe"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/lib64/tomoyo/conf /usr/share/X11/xkb /var/bind"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo"
CXXFLAGS="-march=amdfam10 -O2 -pipe"
DISTDIR="/usr/portage/distfiles"
FEATURES="ccache distlocks fixpackages gpg loadpolicy news parallel-fetch protect-owned sandbox selinux sesandbox severe sfperms strict unmerge-logs unmerge-orphans userfetch"
GENTOO_MIRRORS="http://gentoo.virginmedia.com/ http://gentoo.tiscali.nl/ http://de-mirror.org/distro/gentoo/ http://gentoo.mneisen.org/"
LDFLAGS="-Wl,-O1"
LINGUAS="en_GB en"
MAKEOPTS="-j4"
PKGDIR="/usr/portage/packages"
PORTAGE_CONFIGROOT="/"
PORTAGE_RSYNC_EXTRA_OPTS="--quiet"
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="/dev/shm"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/local/portage/layman/armagetron /usr/local/portage/layman/suka /usr/local/portage/local"
SYNC="rsync://rsync.gentoo.org/gentoo-portage"
USE="X a52 aac acl acpi alsa amd64 aspell avahi bash-completion berkdb bzip2 cdda cdr cli cracklib crypt cups cxx dbus dhcpcd djvu dri dvd dvdr encode ffmpeg flac fortran gdbm gif git gnome gnutls gpm gstreamer gtk hal hddtemp hdri iconv imap ipv6 jbig jpeg jpeg2k kerberos ldap lm_sensors lzma lzo mad mikmod mmx modules mp3 mp4 mpeg mudflap multilib nautilus ncurses networkmanager nls nptl nvidia ogg opengl openmp pam pcre perl png pppd python rar readline reflection samba sdl selinux sensord session spell spl sse sse2 ssl subversion svg tcpd tga theora threads tiff truetype unicode vorbis x264 xorg xvmc zeroconf zlib" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci 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 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="evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" LINGUAS="en_GB en" RUBY_TARGETS="ruby18" USERLAND="GNU" VIDEO_CARDS="nvidia nv" 
Unset:  CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, FFLAGS, INSTALL_MASK, LANG, LC_ALL, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS

Comment 3 Chris Richards 2010-04-18 20:47:31 UTC

Same problem here:

emerge --info
Portage 2.1.8.3 (selinux/2007.0/amd64/hardened, gcc-4.3.4, glibc-2.10.1-r1, 2.6.28-hardened-r9-selinux-test x86_64)
=================================================================
System uname: Linux-2.6.28-hardened-r9-selinux-test-x86_64-Intel-R-_Xeon-R-_CPU_X3210_@_2.13GHz-with-gentoo-1.12.13
Timestamp of tree: Sun, 18 Apr 2010 04:20:01 +0000
ccache version 2.4 [enabled]
app-shells/bash:     4.0_p37
dev-lang/python:     2.6.4-r1
dev-util/ccache:     2.4-r7
sys-apps/baselayout: 1.12.13
sys-apps/sandbox:    1.6-r2
sys-devel/autoconf:  2.63-r1
sys-devel/automake:  1.9.6-r2, 1.10.3, 1.11.1
sys-devel/binutils:  2.18-r3
sys-devel/gcc:       3.4.6-r2, 4.3.4
sys-devel/gcc-config: 1.4.1
sys-devel/libtool:   2.2.6b
virtual/os-headers:  2.6.30-r1
ACCEPT_KEYWORDS="amd64"
ACCEPT_LICENSE="* -@EULA"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O2 -pipe"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /var/bind"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/fonts/fonts.conf /etc/gconf /etc/php/apache2-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/cli-php5/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo"
CXXFLAGS="-O2 -pipe"
DISTDIR="/usr/portage/distfiles"
FEATURES="assume-digests ccache distlocks fixpackages loadpolicy news parallel-fetch protect-owned sandbox selinux sesandbox sfperms strict unmerge-logs unmerge-orphans userfetch"
GENTOO_MIRRORS="ftp://mirror.iawnet.sandia.gov/pub/gentoo/ ftp://ftp.ndlug.nd.edu/pub/gentoo/ http://open-systems.ufl.edu/mirrors/gentoo http://mirror.phy.olemiss.edu/mirror/gentoo http://mirror.utdlug.org/linux/distributions/gentoo/ "
LDFLAGS="-Wl,-O1"
MAKEOPTS="-j5"
PKGDIR="/usr/portage/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"
SYNC="rsync://rsync.namerica.gentoo.org/gentoo-portage"
USE="amd64 berkdb cli cracklib crypt cxx dri fortran hardened iconv ipv6 mmx modules mudflap ncurses nls openmp pam pcre perl pic pppd python readline reflection selinux session spl sse sse2 ssl tcpd vhosts zlib" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci 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 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 evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" RUBY_TARGETS="ruby18" USERLAND="GNU" VIDEO_CARDS="fbdev glint intel mach64 mga neomagic nv r128 radeon savage sis tdfx trident vesa via vmware voodoo" 
Unset:  CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, FFLAGS, INSTALL_MASK, LANG, LC_ALL, LINGUAS, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS, PORTDIR_OVERLAY

Comment 4 Chris Richards 2010-04-18 20:48:39 UTC

Created attachment 228329 [details]
ebuild environment

Comment 5 Chris Richards 2010-04-18 20:49:01 UTC

Created attachment 228331 [details]
build log

Comment 6 Chris Richards 2010-04-18 21:25:22 UTC

Created attachment 228339 [details]
findutils 4.3.12 selinux diff output

Comment 7 Chris Richards 2010-04-18 21:28:19 UTC

emerge -pqv output

aoaforums portage # emerge -pqv =sys-apps/findutils-4.4.2
[ebuild     U ] sys-apps/findutils-4.4.2 [4.4.0] USE="nls (selinux) -static"

Comment 8 Ryan Kelley 2010-04-20 06:30:28 UTC

Same story here

Portage 2.1.8.3 (selinux/2007.0/amd64/hardened, gcc-4.3.4, glibc-2.10.1-r1, 2.6.28-hardened-r9 x86_64)
=================================================================
                        System Settings
=================================================================
System uname: Linux-2.6.28-hardened-r9-x86_64-AMD_Athlon-tm-_64_X2_Dual_Core_Processor_3800+-with-gentoo-1.12.13
Timestamp of tree: Mon, 19 Apr 2010 08:15:01 +0000
ccache version 2.4 [disabled]
app-shells/bash:     4.0_p37
dev-lang/python:     2.5.4-r3, 2.6.4-r1
dev-util/ccache:     2.4-r7
dev-util/cmake:      2.6.4-r3
sys-apps/baselayout: 1.12.13
sys-apps/sandbox:    1.6-r2
sys-devel/autoconf:  2.63-r1
sys-devel/automake:  1.7.9-r1, 1.9.6-r2, 1.10.3, 1.11.1
sys-devel/binutils:  2.18-r3
sys-devel/gcc:       3.4.6-r2, 4.1.2, 4.3.4
sys-devel/gcc-config: 1.4.1
sys-devel/libtool:   2.2.6b
virtual/os-headers:  2.6.30-r1
ACCEPT_KEYWORDS="amd64"
ACCEPT_LICENSE="* -@EULA"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O2 -pipe -msse3 -march=k8"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/share/X11/xkb"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/eselect/postgresql /etc/fonts/fonts.conf /etc/gconf /etc/php/apache2-php5/ext-active/ /etc/php/cgi-php5/ext-active/ /etc/php/cli-php5/ext-active/ /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d /etc/texmf/web2c"
CXXFLAGS="-O2 -pipe -msse3 -march=k8"
DISTDIR="/usr/portage/distfiles"
FEATURES="assume-digests distlocks fixpackages loadpolicy news parallel-fetch protect-owned sandbox selinux sesandbox sfperms strict unmerge-logs userfetch"
GENTOO_MIRRORS="http://gentoo.mirrors.tds.net/gentoo http://mirror.datapipe.net/gentoo http://mirror.mcs.anl.gov/pub/gentoo/ http://gentoo.netnitco.net http://www.gtlib.gatech.edu/pub/gentoo"
LDFLAGS="-Wl,-O1"
MAKEOPTS="-j3"
PKGDIR="/usr/portage/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"
SYNC="rsync://rsync.namerica.gentoo.org/gentoo-portage"
USE="amd64 apache2 berkdb bzip2 cli cracklib crypt cxx dbus dri fastcgi fortran hardened iconv ipv6 jpeg latex mmx modules mudflap mysql ncurses nls nptl nptlonly openmp pam pcre pdf perl pic png postgres pppd python qt3support readline reflection ruby selinux session sessions spl sqlite3 sse sse2 ssl tcpd tiff xorg zlib" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci 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 auth_digest authn_anon authn_dbd 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 dbd deflate dir disk_cache env expires ext_filter file_cache filter headers ident imagemap include info log_config logio mem_cache mime mime_magic negotiation proxy proxy_ajp proxy_balancer proxy_connect proxy_http rewrite setenvif so speling status unique_id userdir usertrack vhost_alias" ELIBC="glibc" INPUT_DEVICES="keyboard mouse evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" RUBY_TARGETS="ruby18" USERLAND="GNU" VIDEO_CARDS="fbdev glint intel mach64 mga neomagic nv r128 radeon savage sis tdfx trident vesa via vmware voodoo"
Unset:  CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, FFLAGS, INSTALL_MASK, LANG, LC_ALL, LINGUAS, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS

Comment 9 Ryan Kelley 2010-04-20 06:31:28 UTC

 # emerge -pqv =sys-apps/findutils-4.4.2
[ebuild     U ] sys-apps/findutils-4.4.2 [4.4.0] USE="nls (selinux) -static"

Comment 10 Ryan Kelley 2010-04-20 06:35:20 UTC

Created attachment 228477 [details]
The Build Log

Comment 11 Ryan Kelley 2010-04-20 06:36:10 UTC

Created attachment 228479 [details]
diff

Comment 12 Chris Richards 2010-04-25 04:42:39 UTC

Created attachment 229043 [details, diff]
Selinux patch for findutils 4.4.2

Upstream cleaned up find/parser.c code by removing a bunch of trailing whitespace.  This causes hunk #4 in the find/parser.c portion of the patch to fail to apply.

The attached patch was made by simply applying the existing patch using the patch -l option to tell patch to ignore differences in whitespace, then taking the diff from the unpatched files against the patched files.  Verification of the correctness of the patch was done both by comparing the new diff against the old one and by compiling the resulting code.

Comment 13 Chris Richards 2010-04-25 04:44:01 UTC

Created attachment 229045 [details, diff]
Patch to update findutils ebuild to use new selinux patch

This patch modifies the findutils-4.4.2.ebuild to use the new selinux patch previously attached.

Comment 14 Chris Richards 2010-04-26 22:37:45 UTC

Created attachment 229329 [details, diff]
Same as previous selinux patch, but with more context info

This patch was created with the addition of the -p flag, to get context info regarding the function in the source code that is being patched.

Comment 15 Chris Richards 2010-04-26 22:38:03 UTC

Created attachment 229331 [details, diff]
Same as previous selinux patch, but with more context info

This patch was created with the addition of the -p flag, to get context info regarding the function in the source code that is being patched.

Comment 16 Chris Richards 2010-05-03 15:44:53 UTC

Created attachment 230157 [details]
emerge --info

Comment 17 Mattias Merilai 2010-05-09 11:36:33 UTC

going live anytime?

Comment 18 Chris PeBenito (RETIRED) gentoo-dev

2010-05-09 14:18:20 UTC

Sorry for the delay. Committed to cvs.

Comment 19 Mattias Merilai 2010-05-10 16:12:47 UTC

(In reply to comment #18)
> Sorry for the delay. Committed to cvs.
> 

Thanks!