Bug 205529 - sys-apps/util-linux-2.13-r3 fails to apply loop-aes patch
Bug#: 205529 Product:  Gentoo Linux Version: 2007.0 Platform: All
OS/Version: Linux Status: RESOLVED Severity: normal Priority: P2
Resolution: FIXED Assigned To: base-system@gentoo.org Reported By: tarpman@gmail.com
Component: Ebuilds
URL: 
Summary: sys-apps/util-linux-2.13-r3 fails to apply loop-aes patch
Keywords:  
Status Whiteboard: 
Opened: 2008-01-12 19:50 0000
Description:   Opened: 2008-01-12 19:50 0000
=======================================

PATCH COMMAND:   patch -p1 -g0 -E --no-backup-if-mismatch <
/var/tmp/portage/sys-apps/util-linux-2.13-r3/work/loop-AES-v3.2b/util-linux-ng-2.13.0.1.diff

=======================================
patching file mount/Makefile.am
patching file mount/Makefile.in
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 15.
Hunk #3 succeeded at 73 (offset 4 lines).
Hunk #4 FAILED at 93.
Hunk #5 succeeded at 110 (offset 2 lines).
Hunk #6 FAILED at 135.
Hunk #7 FAILED at 165.
Hunk #8 FAILED at 239.
Hunk #9 FAILED at 279.
Hunk #10 FAILED at 302.
Hunk #11 FAILED at 324.
Hunk #12 succeeded at 440 (offset 73 lines).
Hunk #13 FAILED at 493.
Hunk #14 FAILED at 519.
Hunk #15 FAILED at 542.
Hunk #16 succeeded at 568 (offset 73 lines).
Hunk #17 succeeded at 583 (offset 73 lines).
Hunk #18 succeeded at 598 (offset 73 lines).
Hunk #19 succeeded at 607 (offset 73 lines).
Hunk #20 FAILED at 616.
Hunk #21 FAILED at 1222.
Hunk #22 FAILED at 1315.
Hunk #23 FAILED at 1347.
Hunk #24 FAILED at 1396.
Hunk #25 FAILED at 1423.
18 out of 25 hunks FAILED -- saving rejects to file mount/Makefile.in.rej
patching file mount/aes.c
patching file mount/aes.h
patching file mount/lomount.c
patching file mount/lomount.h
patching file mount/loop.c
patching file mount/loop.h
patching file mount/losetup.8
patching file mount/loumount.c
patching file mount/mount.8
patching file mount/mount.c
patching file mount/rmd160.c
patching file mount/rmd160.h
patching file mount/sha512.c
patching file mount/sha512.h
patching file mount/swapon.8
patching file mount/swapon.c
=======================================


Couldn't find the Makefile.in.rej to paste; is there some option I can pass to
cause it to be saved?


Portage 2.1.4 (default-linux/x86/2007.0/desktop, gcc-4.2.2, glibc-2.7-r1,
2.6.23-tuxonice-r6 i686)
=================================================================
System uname: 2.6.23-tuxonice-r6 i686 Genuine Intel(R) CPU T2400 @ 1.83GHz
Timestamp of tree: Sat, 12 Jan 2008 18:46:01 +0000
app-shells/bash:     3.2_p33
dev-java/java-config: 1.3.7, 2.1.3
dev-lang/python:     2.5.1-r5
sys-apps/baselayout: 2.0.0_rc6-r1
sys-apps/sandbox:    1.2.18.1-r2
sys-devel/autoconf:  2.13, 2.61-r1
sys-devel/automake:  1.7.9-r1, 1.9.6-r2, 1.10
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.23-r3
ACCEPT_KEYWORDS="x86 ~x86"
CBUILD="i686-pc-linux-gnu"
CFLAGS="-O2 -march=nocona -fomit-frame-pointer -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/gentoo-release /etc/revdep-rebuild /etc/splash /etc/terminfo
/etc/udev/rules.d"
CXXFLAGS="-O2 -march=nocona -fomit-frame-pointer -pipe"
DISTDIR="/usr/portage/distfiles"
FEATURES="distlocks metadata-transfer parallel-fetch sandbox sfperms strict
unmerge-orphans userfetch"
GENTOO_MIRRORS="ftp://gentoo.osuosl.org/pub/gentoo"
LANG="en_CA.UTF-8"
LC_ALL="en_CA.UTF-8"
LINGUAS="en"
MAKEOPTS="-j3"
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"
PORTDIR_OVERLAY="/usr/portage/local/layman/armagetron /usr/local/portage"
SYNC="rsync://rsync.ca.gentoo.org/gentoo-portage"
USE="X a52 aac acpi aio alsa amrnb amrwb ao async berkdb bzip2 cairo caps cddb
cdio cdparanoia curl custom-cflags dbus divx dri dts dv dvd encode expat fam
fbcondecor fbsplash firefox flac fontconfig ftp gdbm gecko gif glitz hal hpn
iconv idn ipw3945 ithreads jabber jpeg jpeg2k laptop lcms libedit logrotate lzo
mad midi mmap mmx mmxext moviepack moviesounds mp3 msn multicall multiuser
ncurses nethack network-cron nptl nsplugin offensive ogg opengl pam pcre pdf
pic png quicktime rar readline rtc samba slang smp srt sse sse2 ssl ssse3 svg
symlink theora threads truetype unicode urandom utils vim-syntax vim-with-x
vorbis wifi win32codecs wmp x264 x86 xattr xcb xinerama xml xorg xv xvid xvmc
yahoo zlib" ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci
emu10k1        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 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 keyboard synaptics" KERNEL="linux"
LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses
text" LINGUAS="en" USERLAND="GNU" VIDEO_CARDS="none nvidia"
Unset:  CPPFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LDFLAGS,
PORTAGE_COMPRESS, PORTAGE_COMPRESS_FLAGS, PORTAGE_RSYNC_EXTRA_OPTS

------- Comment #1 From SpanKY 2008-01-12 22:26:32 0000 -------
fixed in 2.13.0.1, thanks for reporting

------- Comment #2 From Ryan Tandy 2008-01-16 18:40:12 0000 -------
This issue has re-appeared in util-linux-2.13.1, which still uses the loop-aes
patch against 2.13.0.1.


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

PATCH COMMAND:   patch -p1 -g0 -E --no-backup-if-mismatch <
/var/tmp/portage/sys-apps/util-linux-2.13.1/work/loop-AES-v3.2b/util-linux-ng-2.13.0.1.diff

=======================================
patching file mount/Makefile.am
patching file mount/Makefile.in
Hunk #11 FAILED at 322.
1 out of 25 hunks FAILED -- saving rejects to file mount/Makefile.in.rej
patching file mount/aes.c
patching file mount/aes.h
patching file mount/lomount.c
Hunk #7 FAILED at 827.
Hunk #8 succeeded at 1108 (offset 4 lines).
1 out of 8 hunks FAILED -- saving rejects to file mount/lomount.c.rej
patching file mount/lomount.h
patching file mount/loop.c
patching file mount/loop.h
patching file mount/losetup.8
patching file mount/loumount.c
patching file mount/mount.8
patching file mount/mount.c
Hunk #13 succeeded at 1847 (offset 6 lines).
patching file mount/rmd160.c
patching file mount/rmd160.h
patching file mount/sha512.c
patching file mount/sha512.h
patching file mount/swapon.8
patching file mount/swapon.c
=======================================

------- Comment #3 From SpanKY 2008-01-16 20:13:41 0000 -------
new issues => new bugs

loop-aes wont get fixed in 2.13.1 until upstream releases a new patchset