Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 375391 - sys-apps/util-linux-2.19.1-r1: patch failure util-linux-2.19.1-umount-l-nfs.patch
Summary: sys-apps/util-linux-2.19.1-r1: patch failure util-linux-2.19.1-umount-l-nfs.p...
Status: RESOLVED DUPLICATE of bug 375165
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Core system (show other bugs)
Hardware: AMD64 Linux
: Normal normal (vote)
Assignee: Gentoo Linux bug wranglers
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-07-16 18:00 UTC by MrSnivvel
Modified: 2011-07-16 18:42 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description MrSnivvel 2011-07-16 18:00:55 UTC
>>> Emerging (1 of 25) sys-apps/util-linux-2.19.1-r1
 * util-linux-2.19.1.tar.bz2 RMD160 SHA1 SHA256 size ;-) ...                                                                                                                 [ ok ]
 * util-linux-2.19.1-20110510.diff.bz2 RMD160 SHA1 SHA256 size ;-) ...                                                                                                       [ ok ]
>>> Unpacking source...
>>> Unpacking util-linux-2.19.1.tar.bz2 to /var/tmp/portage/sys-apps/util-linux-2.19.1-r1/work
>>> Unpacking util-linux-2.19.1-20110510.diff.bz2 to /var/tmp/portage/sys-apps/util-linux-2.19.1-r1/work
>>> Source unpacked in /var/tmp/portage/sys-apps/util-linux-2.19.1-r1/work
>>> Preparing source in /var/tmp/portage/sys-apps/util-linux-2.19.1-r1/work/util-linux-2.19.1 ...
 * Applying util-linux-2.19.1-20110510.diff ...                                                                                                                              [ ok ]
 * Applying util-linux-2.19.1-mount-a-segv.patch ...                                                                                                                         [ ok ]
 * Applying util-linux-2.19.1-umount-l-nfs.patch ...

 * Failed Patch: util-linux-2.19.1-umount-l-nfs.patch !
 *  ( /usr/portage/sys-apps/util-linux/files/util-linux-2.19.1-umount-l-nfs.patch )


Reproducible: Always




Portage 2.1.10.6 (hardened/linux/amd64, gcc-4.5.2, glibc-2.13-r4, 2.6.37-hardened-r5 x86_64)
=================================================================
System uname: Linux-2.6.37-hardened-r5-x86_64-Intel-R-_Xeon-R-_CPU_L5609_@_1.87GHz-with-gentoo-2.0.3
Timestamp of tree: Sat, 16 Jul 2011 14:30:01 +0000
app-shells/bash:          4.2_p10
dev-lang/python:          2.6.6-r2, 2.7.2, 3.1.3-r1, 3.2
dev-util/cmake:           2.8.4-r1
dev-util/pkgconfig:       0.26
sys-apps/baselayout:      2.0.3
sys-apps/openrc:          0.8.3
sys-apps/sandbox:         2.5
sys-devel/autoconf:       2.68
sys-devel/automake:       1.11.1-r1
sys-devel/binutils:       2.21.1
sys-devel/gcc:            4.4.5, 4.5.2
sys-devel/gcc-config:     1.4.1-r1
sys-devel/libtool:        2.4-r1
sys-devel/make:           3.82-r1
sys-kernel/linux-headers: 2.6.38 (virtual/os-headers)
sys-libs/glibc:           2.13-r4
Repositories: gentoo wschlich-testing
ACCEPT_KEYWORDS="amd64 ~amd64"
ACCEPT_LICENSE="*"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O2 -march=core2 -mtune=core2 -pipe -g -ggdb"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /var/bind"
CONFIG_PROTECT_MASK="/etc/ca-certificates.conf /etc/env.d /etc/gconf /etc/gentoo-release /etc/revdep-rebuild /etc/sandbox.d /etc/terminfo"
CXXFLAGS="-O2 -march=core2 -mtune=core2 -pipe -g -ggdb"
DISTDIR="/var/cache/http-replicator"
FEATURES="assume-digests binpkg-logs candy distlocks ebuild-locks fixlafiles fixpackages metadata-transfer news parallel-fetch protect-owned sandbox sfperms splitdebug strict unknown-features-warn unmerge-logs unmerge-orphans userfetch userpriv usersandbox"
FFLAGS=""
GENTOO_MIRRORS="http://www.cyberuse.com/gentoo/ http://mirror.csclub.uwaterloo.ca/gentoo-distfiles/ http://gentoo.mirrors.tds.net/gentoo http://gentoo.arcticnetwork.ca/ http://gentoo.mirrors.tera-byte.com/ http://gentoo.osuosl.org/ http://chi-10g-1-mirror.fastsoft.net/pub/linux/gentoo/gentoo-distfiles/ http://gentoo.wetzlmayr.com/ http://gentoo.cites.uiuc.edu/pub/gentoo/"
LDFLAGS="-Wl,-O1 -Wl,--as-needed"
MAKEOPTS="-j24"
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="/var/lib/layman/wschlich-testing"

USE="3dnow 3dnowext acl acpi aio amd64 apache2 archive async automount bacula-clientonly bacula-console bash-completion berkdb bzip2 caps cgi cli command-args cracklib crypt ctype cxx dbus debug device-mapper disk-partition diskio dri elf extras fam filter fuse gd gd-external gdbm git gnutls gpm hardened iconv iproute2 ipv6 iscsi ithreads jabber java6 jpeg json justify ldap libsysfs lm_sensors logrotate logwatch loop-aes lvm lzma lzo mmap mmx mmxext modules mudflap multilib mysql nagios-dns nagios-ntp nagios-ping nagios-ssh ncurses network nptl nptlonly offensive openmp openssl overlays pam parted pcre pdo perl pkinit png postgres pppd python quotas readline sasl session simplexml snmp soap sockets socks5 sse sse2 sse3 ssl ssse3 subversion sysfs syslog tcpd threads tiff tools udev unicode ups urandom utils vhosts vim-syntax xattr xforward xml xmlreader xmlrpc xorg xsl zip 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 cgi cgid 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" CALLIGRA_FEATURES="braindump flow karbon kexi kpresenter krita tables words" CAMERAS="ptp2" COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" ELIBC="glibc" GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ubx" INPUT_DEVICES="keyboard mouse evdev" KERNEL="linux" LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" PHP_TARGETS="php5-3" RUBY_TARGETS="ruby18" USERLAND="GNU" VIDEO_CARDS="fbdev glint intel mach64 mga neomagic nouveau nv r128 radeon savage sis tdfx trident vesa via vmware dummy v4l" XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account" 
Unset:  CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LANG, LC_ALL, LINGUAS, PORTAGE_BUNZIP2_COMMAND, PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS



***** util-linux-2.19.1-umount-l-nfs.patch *****

================================================

PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch < '/usr/portage/sys-apps/util-linux/files/util-linux-2.19.1-umount-l-nfs.patch'

================================================
can't find file to patch at input line 27
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|https://bugs.gentoo.org/370051
|
|From b3b0c657818aa6191e6494f88d671601dd9d837d Mon Sep 17 00:00:00 2001
|From: Petr Uzel <petr.uzel@suse.cz>
|Date: Wed, 29 Jun 2011 10:24:09 +0200
|Subject: [PATCH] umount: do not hang with disconnected NFS mounts
|
|Since util-linux commit f4612577c942a3683b97632ad0b49671897c2070,
|umount stat(2)s its argument to check whether it can be associated
|with some loop device. This could hang with broken NFS mounts.
|
|Fix by first checking mtab if umount's argument is mounted and only if
|we fail, check if there is a loop device associated.
|
|http://marc.info/?l=util-linux-ng&m=130924963804836&w=2
|
|Reported-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
|Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
|---
| mount/umount.c |   42 ++++++++++++++++++++++--------------------
| 1 files changed, 22 insertions(+), 20 deletions(-)
|
|diff --git a/mount/umount.c b/mount/umount.c
|index 0349cb3..96c940e 100644
|--- a/mount/umount.c
|+++ b/mount/umount.c
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored
================================================

PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch < '/usr/portage/sys-apps/util-linux/files/util-linux-2.19.1-umount-l-nfs.patch'

================================================
patching file mount/umount.c
Hunk #1 succeeded at 573 with fuzz 2 (offset -27 lines).
Hunk #2 FAILED at 609.
Hunk #3 succeeded at 637 (offset -23 lines).
1 out of 3 hunks FAILED -- saving rejects to file mount/umount.c.rej
================================================

PATCH COMMAND:  patch -p2 -g0 -E --no-backup-if-mismatch < '/usr/portage/sys-apps/util-linux/files/util-linux-2.19.1-umount-l-nfs.patch'

================================================
can't find file to patch at input line 27
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|https://bugs.gentoo.org/370051
|
|From b3b0c657818aa6191e6494f88d671601dd9d837d Mon Sep 17 00:00:00 2001
|From: Petr Uzel <petr.uzel@suse.cz>
|Date: Wed, 29 Jun 2011 10:24:09 +0200
|Subject: [PATCH] umount: do not hang with disconnected NFS mounts
|
|Since util-linux commit f4612577c942a3683b97632ad0b49671897c2070,
|umount stat(2)s its argument to check whether it can be associated
|with some loop device. This could hang with broken NFS mounts.
|
|Fix by first checking mtab if umount's argument is mounted and only if
|we fail, check if there is a loop device associated.
|
|http://marc.info/?l=util-linux-ng&m=130924963804836&w=2
|
|Reported-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
|Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
|---
| mount/umount.c |   42 ++++++++++++++++++++++--------------------
| 1 files changed, 22 insertions(+), 20 deletions(-)
|
|diff --git a/mount/umount.c b/mount/umount.c
|index 0349cb3..96c940e 100644
|--- a/mount/umount.c
|+++ b/mount/umount.c
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored
================================================

PATCH COMMAND:  patch -p3 -g0 -E --no-backup-if-mismatch < '/usr/portage/sys-apps/util-linux/files/util-linux-2.19.1-umount-l-nfs.patch'

================================================
can't find file to patch at input line 27
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|https://bugs.gentoo.org/370051
|
|From b3b0c657818aa6191e6494f88d671601dd9d837d Mon Sep 17 00:00:00 2001
|From: Petr Uzel <petr.uzel@suse.cz>
|Date: Wed, 29 Jun 2011 10:24:09 +0200
|Subject: [PATCH] umount: do not hang with disconnected NFS mounts
|
|Since util-linux commit f4612577c942a3683b97632ad0b49671897c2070,
|umount stat(2)s its argument to check whether it can be associated
|with some loop device. This could hang with broken NFS mounts.
|
|Fix by first checking mtab if umount's argument is mounted and only if
|we fail, check if there is a loop device associated.
|
|http://marc.info/?l=util-linux-ng&m=130924963804836&w=2
|
|Reported-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
|Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
|---
| mount/umount.c |   42 ++++++++++++++++++++++--------------------
| 1 files changed, 22 insertions(+), 20 deletions(-)
|
|diff --git a/mount/umount.c b/mount/umount.c
|index 0349cb3..96c940e 100644
|--- a/mount/umount.c
|+++ b/mount/umount.c
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored
================================================

PATCH COMMAND:  patch -p4 -g0 -E --no-backup-if-mismatch < '/usr/portage/sys-apps/util-linux/files/util-linux-2.19.1-umount-l-nfs.patch'

================================================
can't find file to patch at input line 27
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|https://bugs.gentoo.org/370051
|
|From b3b0c657818aa6191e6494f88d671601dd9d837d Mon Sep 17 00:00:00 2001
|From: Petr Uzel <petr.uzel@suse.cz>
|Date: Wed, 29 Jun 2011 10:24:09 +0200
|Subject: [PATCH] umount: do not hang with disconnected NFS mounts
|
|Since util-linux commit f4612577c942a3683b97632ad0b49671897c2070,
|umount stat(2)s its argument to check whether it can be associated
|with some loop device. This could hang with broken NFS mounts.
|
|Fix by first checking mtab if umount's argument is mounted and only if
|we fail, check if there is a loop device associated.
|
|http://marc.info/?l=util-linux-ng&m=130924963804836&w=2
|
|Reported-by: Konstantin Khlebnikov <khlebnikov@openvz.org>
|Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
|---
| mount/umount.c |   42 ++++++++++++++++++++++--------------------
| 1 files changed, 22 insertions(+), 20 deletions(-)
|
|diff --git a/mount/umount.c b/mount/umount.c
|index 0349cb3..96c940e 100644
|--- a/mount/umount.c
|+++ b/mount/umount.c
--------------------------
No file to patch.  Skipping patch.
3 out of 3 hunks ignored
Comment 1 Agostino Sarubbo gentoo-dev 2011-07-16 18:42:48 UTC

*** This bug has been marked as a duplicate of bug 375165 ***