Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 131517 - hardened-sources-2.6.14-r8 failed on applying 4705_squashfs-2.2.patch
Summary: hardened-sources-2.6.14-r8 failed on applying 4705_squashfs-2.2.patch
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Hardened (show other bugs)
Hardware: All Linux
: High normal (vote)
Assignee: The Gentoo Linux Hardened Team
URL:
Whiteboard:
Keywords:
: 131578 (view as bug list)
Depends on:
Blocks:
 
Reported: 2006-04-27 15:03 UTC by Lars Strojny
Modified: 2006-04-28 08:41 UTC (History)
6 users (show)

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 Lars Strojny 2006-04-27 15:03:27 UTC
Patching output:
Attempting Dry-run:
cmd: patch -p0 --dry-run -f < /var/tmp/portage/hardened-sources-2.6.14-r8/work/patches/2.6.14/4705_squashfs-2.2.patch
=======================================================
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --new-file -urp linux-2.6.12/fs/Kconfig linux-2.6.12-squashfs2.2/fs/Kconfig
|--- linux-2.6.12/fs/Kconfig    2005-06-17 20:48:29.000000000 +0100
|+++ linux-2.6.12-squashfs2.2/fs/Kconfig        2005-07-04 02:35:35.000000000 +0100
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 77
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --new-file -urp linux-2.6.12/fs/Makefile linux-2.6.12-squashfs2.2/fs/Makefile
|--- linux-2.6.12/fs/Makefile   2005-06-17 20:48:29.000000000 +0100
|+++ linux-2.6.12-squashfs2.2/fs/Makefile       2005-07-04 02:35:35.000000000 +0100
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
patching file linux-2.6.12/fs/squashfs/inode.c
patching file linux-2.6.12/fs/squashfs/Makefile
patching file linux-2.6.12/include/linux/squashfs_fs.h
patching file linux-2.6.12/include/linux/squashfs_fs_i.h
patching file linux-2.6.12/include/linux/squashfs_fs_sb.h
can't find file to patch at input line 2545
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --new-file -urp linux-2.6.12/init/do_mounts_rd.c linux-2.6.12-squashfs2.2/init/do_mounts_rd.c
|--- linux-2.6.12/init/do_mounts_rd.c   2005-06-17 20:48:29.000000000 +0100
|+++ linux-2.6.12-squashfs2.2/init/do_mounts_rd.c       2005-07-04 02:35:35.000000000 +0100
--------------------------
No file to patch.  Skipping patch.
5 out of 5 hunks ignored
Attempting Dry-run:
cmd: patch -p1 --dry-run -f < /var/tmp/portage/hardened-sources-2.6.14-r8/work/patches/2.6.14/4705_squashfs-2.2.patch
=======================================================
patching file fs/Kconfig
Hunk #1 succeeded at 1188 (offset 17 lines).
patching file fs/Makefile
Hunk #1 FAILED at 52.
1 out of 1 hunk FAILED -- saving rejects to file fs/Makefile.rej
The next patch would create the file fs/squashfs/inode.c,
which already exists!  Applying it anyway.
patching file fs/squashfs/inode.c
Patch attempted to create file fs/squashfs/inode.c, which already exists.
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file fs/squashfs/inode.c.rej
The next patch would create the file fs/squashfs/Makefile,
which already exists!  Applying it anyway.
patching file fs/squashfs/Makefile
Patch attempted to create file fs/squashfs/Makefile, which already exists.
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file fs/squashfs/Makefile.rej
The next patch would create the file include/linux/squashfs_fs.h,
which already exists!  Applying it anyway.
patching file include/linux/squashfs_fs.h
Patch attempted to create file include/linux/squashfs_fs.h, which already exists.
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file include/linux/squashfs_fs.h.rej
The next patch would create the file include/linux/squashfs_fs_i.h,
which already exists!  Applying it anyway.
patching file include/linux/squashfs_fs_i.h
Patch attempted to create file include/linux/squashfs_fs_i.h, which already exists.
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file include/linux/squashfs_fs_i.h.rej
The next patch would create the file include/linux/squashfs_fs_sb.h,
which already exists!  Applying it anyway.
patching file include/linux/squashfs_fs_sb.h
Patch attempted to create file include/linux/squashfs_fs_sb.h, which already exists.
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file include/linux/squashfs_fs_sb.h.rej
patching file init/do_mounts_rd.c
Hunk #1 FAILED at 5.
Hunk #2 FAILED at 40.
Hunk #3 FAILED at 55.
Hunk #4 FAILED at 67.
Hunk #5 succeeded at 118 (offset 13 lines).
4 out of 5 hunks FAILED -- saving rejects to file init/do_mounts_rd.c.rej
Attempting Dry-run:
cmd: patch -p2 --dry-run -f < /var/tmp/portage/hardened-sources-2.6.14-r8/work/patches/2.6.14/4705_squashfs-2.2.patch
=======================================================
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --new-file -urp linux-2.6.12/fs/Kconfig linux-2.6.12-squashfs2.2/fs/Kconfig
|--- linux-2.6.12/fs/Kconfig    2005-06-17 20:48:29.000000000 +0100
|+++ linux-2.6.12-squashfs2.2/fs/Kconfig        2005-07-04 02:35:35.000000000 +0100
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
patching file Makefile
Hunk #1 FAILED at 52.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej
patching file squashfs/inode.c
patching file squashfs/Makefile
patching file linux/squashfs_fs.h
patching file linux/squashfs_fs_i.h
patching file linux/squashfs_fs_sb.h
can't find file to patch at input line 2545
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --new-file -urp linux-2.6.12/init/do_mounts_rd.c linux-2.6.12-squashfs2.2/init/do_mounts_rd.c
|--- linux-2.6.12/init/do_mounts_rd.c   2005-06-17 20:48:29.000000000 +0100
|+++ linux-2.6.12-squashfs2.2/init/do_mounts_rd.c       2005-07-04 02:35:35.000000000 +0100
--------------------------
No file to patch.  Skipping patch.
5 out of 5 hunks ignored
Attempting Dry-run:
cmd: patch -p3 --dry-run -f < /var/tmp/portage/hardened-sources-2.6.14-r8/work/patches/2.6.14/4705_squashfs-2.2.patch
=======================================================
missing header for unified diff at line 4 of patch
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --new-file -urp linux-2.6.12/fs/Kconfig linux-2.6.12-squashfs2.2/fs/Kconfig
|--- linux-2.6.12/fs/Kconfig    2005-06-17 20:48:29.000000000 +0100
|+++ linux-2.6.12-squashfs2.2/fs/Kconfig        2005-07-04 02:35:35.000000000 +0100
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 77 of patch
can't find file to patch at input line 77
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --new-file -urp linux-2.6.12/fs/Makefile linux-2.6.12-squashfs2.2/fs/Makefile
|--- linux-2.6.12/fs/Makefile   2005-06-17 20:48:29.000000000 +0100
|+++ linux-2.6.12-squashfs2.2/fs/Makefile       2005-07-04 02:35:35.000000000 +0100
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
patching file inode.c
The next patch would create the file Makefile,
which already exists!  Applying it anyway.
patching file Makefile
Patch attempted to create file Makefile, which already exists.
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej
patching file squashfs_fs.h
patching file squashfs_fs_i.h
patching file squashfs_fs_sb.h
missing header for unified diff at line 2545 of patch
can't find file to patch at input line 2545
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --new-file -urp linux-2.6.12/init/do_mounts_rd.c linux-2.6.12-squashfs2.2/init/do_mounts_rd.c
|--- linux-2.6.12/init/do_mounts_rd.c   2005-06-17 20:48:29.000000000 +0100
|+++ linux-2.6.12-squashfs2.2/init/do_mounts_rd.c       2005-07-04 02:35:35.000000000 +0100
--------------------------
No file to patch.  Skipping patch.
5 out of 5 hunks ignored
Attempting Dry-run:
cmd: patch -p4 --dry-run -f < /var/tmp/portage/hardened-sources-2.6.14-r8/work/patches/2.6.14/4705_squashfs-2.2.patch
=======================================================
missing header for unified diff at line 4 of patch
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --new-file -urp linux-2.6.12/fs/Kconfig linux-2.6.12-squashfs2.2/fs/Kconfig
|--- linux-2.6.12/fs/Kconfig    2005-06-17 20:48:29.000000000 +0100
|+++ linux-2.6.12-squashfs2.2/fs/Kconfig        2005-07-04 02:35:35.000000000 +0100
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 77 of patch
can't find file to patch at input line 77
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --new-file -urp linux-2.6.12/fs/Makefile linux-2.6.12-squashfs2.2/fs/Makefile
|--- linux-2.6.12/fs/Makefile   2005-06-17 20:48:29.000000000 +0100
|+++ linux-2.6.12-squashfs2.2/fs/Makefile       2005-07-04 02:35:35.000000000 +0100
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 88 of patch
can't find file to patch at input line 88
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --new-file -urp linux-2.6.12/fs/squashfs/inode.c linux-2.6.12-squashfs2.2/fs/squashfs/inode.c
|--- linux-2.6.12/fs/squashfs/inode.c   1970-01-01 01:00:00.000000000 +0100
|+++ linux-2.6.12-squashfs2.2/fs/squashfs/inode.c       2005-07-04 02:35:35.000000000 +0100
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 1895 of patch
can't find file to patch at input line 1895
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --new-file -urp linux-2.6.12/fs/squashfs/Makefile linux-2.6.12-squashfs2.2/fs/squashfs/Makefile
|--- linux-2.6.12/fs/squashfs/Makefile  1970-01-01 01:00:00.000000000 +0100
|+++ linux-2.6.12-squashfs2.2/fs/squashfs/Makefile      2005-07-04 02:35:35.000000000 +0100
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 1906 of patch
can't find file to patch at input line 1906
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --new-file -urp linux-2.6.12/include/linux/squashfs_fs.h linux-2.6.12-squashfs2.2/include/linux/squashfs_fs.h
|--- linux-2.6.12/include/linux/squashfs_fs.h   1970-01-01 01:00:00.000000000 +0100
|+++ linux-2.6.12-squashfs2.2/include/linux/squashfs_fs.h       2005-07-04 02:35:35.000000000 +0100
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 2429 of patch
can't find file to patch at input line 2429
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --new-file -urp linux-2.6.12/include/linux/squashfs_fs_i.h linux-2.6.12-squashfs2.2/include/linux/squashfs_fs_i.h
|--- linux-2.6.12/include/linux/squashfs_fs_i.h 1970-01-01 01:00:00.000000000 +0100
|+++ linux-2.6.12-squashfs2.2/include/linux/squashfs_fs_i.h     2005-07-04 02:35:35.000000000 +0100
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 2476 of patch
can't find file to patch at input line 2476
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --new-file -urp linux-2.6.12/include/linux/squashfs_fs_sb.h linux-2.6.12-squashfs2.2/include/linux/squashfs_fs_sb.h
|--- linux-2.6.12/include/linux/squashfs_fs_sb.h        1970-01-01 01:00:00.000000000 +0100
|+++ linux-2.6.12-squashfs2.2/include/linux/squashfs_fs_sb.h    2005-07-04 02:35:35.000000000 +0100
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
missing header for unified diff at line 2545 of patch
can't find file to patch at input line 2545
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --new-file -urp linux-2.6.12/init/do_mounts_rd.c linux-2.6.12-squashfs2.2/init/do_mounts_rd.c
|--- linux-2.6.12/init/do_mounts_rd.c   2005-06-17 20:48:29.000000000 +0100
|+++ linux-2.6.12-squashfs2.2/init/do_mounts_rd.c       2005-07-04 02:35:35.000000000 +0100
--------------------------
No file to patch.  Skipping patch.
5 out of 5 hunks ignored


emerge --info:
Portage 2.1_pre9-r4 (default-linux/amd64/2006.0, gcc-3.4.5, glibc-2.3.5-r2, 2.6.14-hardened-r5 x86_64)
=================================================================
System uname: 2.6.14-hardened-r5 x86_64 AMD Opteron(tm) Processor 248
Gentoo Base System version 1.6.14
ccache version 2.3 [enabled]
dev-lang/python:     2.4.2
sys-apps/sandbox:    1.2.12
sys-devel/autoconf:  2.13, 2.59-r7
sys-devel/automake:  1.4_p6, 1.5, 1.6.3, 1.7.9-r1, 1.8.5-r3, 1.9.6-r1
sys-devel/binutils:  2.16.1
sys-devel/libtool:   1.5.22
virtual/os-headers:  2.6.11-r2
ACCEPT_KEYWORDS="amd64"
AUTOCLEAN="yes"
CBUILD="x86_64-pc-linux-gnu"
CFLAGS="-O2 -march=athlon64 -pipe"
CHOST="x86_64-pc-linux-gnu"
CONFIG_PROTECT="/etc /usr/kde/2/share/config /usr/kde/3/share/config /usr/share/config /var/qmail/control"
CONFIG_PROTECT_MASK="/etc/eselect/compiler /etc/gconf /etc/revdep-rebuild /etc/terminfo /etc/env.d"
CXXFLAGS="-O2 -march=athlon64 -pipe"
DISTDIR="/usr/portage/distfiles"
FEATURES="autoconfig ccache collision-protect distlocks metadata-transfer sandbox sfperms strict userpriv usersandbox"
GENTOO_MIRRORS="http://mirror.switch.ch/mirror/gentoo/"
LANG="en_US.UTF-8"
LC_ALL="en_US.UTF-8"
LINGUAS="de en"
MAKEOPTS="-j3"
PKGDIR="/usr/portage/packages"
PORTAGE_TMPDIR="/var/tmp"
PORTDIR="/usr/portage"
PORTDIR_OVERLAY="/usr/local/portage"
SYNC="rsync://rsync.de.gentoo.org/gentoo-portage"
USE="amd64 acl apache2 bash-completion bzip2 crypt cscope curl exif gif idn imagemagick imap ipv6 ithreads jpeg mailwrapper mysql ncurses nls nptl nptlonly pam pcre perl png postgres python qdbm readline ruby spell sqlite srvdir ssl tiff truetype unicode userlocales vhosts xml zlib elibc_glibc kernel_linux linguas_de linguas_en userland_GNU"
Unset:  ASFLAGS, CTARGET, EMERGE_DEFAULT_OPTS, INSTALL_MASK, LDFLAGS
Comment 1 Manuel McLure 2006-04-27 15:29:36 UTC
I can confirm the same problem.
Comment 2 Willie Wong 2006-04-27 17:47:42 UTC
(In reply to comment #1)
> I can confirm the same problem.

I can also confirm the problem.
Comment 3 Natanael Copa 2006-04-27 23:43:54 UTC
Confirming the same problem on my gentoo-embedded.
Comment 4 Konstantin Arkhipov (RETIRED) gentoo-dev 2006-04-28 03:53:36 UTC
same here, on x86.
Comment 5 Natanael Copa 2006-04-28 04:29:50 UTC
Here are some ouput:

 * Applying 4505_vesafb-tng-1.0-rc1-r2.patch (-p0+) ...                   [ ok ]
 * Applying 4700_reiser-disableseclabels.patch (-p0+) ...                 [ ok ]
 * Applying 4705_squashfs-2.2-r2.patch (-p0+) ...                         [ ok ]
 * Applying 4705_squashfs-2.2.patch (-p0+) ...                            [ !! ]
 * Please attach /var/tmp/portage/hardened-sources-2.6.14-r8/temp/4705_squashfs-2.2.err to any bug you may post.

I wonder if both 4705_squashfs-2.2-r2.patch *and* 4705_squashfs-2.2.patch should be there?
Comment 6 John Mylchreest (RETIRED) gentoo-dev 2006-04-28 05:35:00 UTC
hey all,

There appears to have been some kind of screw-up between me, the SHA issue, the digest problems and the mirrors.

Please rm -Rf /usr/portage/distfiles/{hardened-,gen}patches*, emerge sync and try again. There are new tarballs rolling out but if your anxious, fetch the most recent ones from dev.gentoo.org/~johnm/hardened-sources && dev.gentoo.org/~johnm/genpatches

Cheers.
Comment 7 Jakub Moc (RETIRED) gentoo-dev 2006-04-28 08:41:38 UTC
*** Bug 131578 has been marked as a duplicate of this bug. ***