>>> emerge (1 of 1) net-ftp/vsftpd-2.0.1 to / >>> md5 src_uri ;-) vsftpd-2.0.1.tar.gz >>> Unpacking source... >>> Unpacking vsftpd-2.0.1.tar.gz to /var/tmp/portage/vsftpd-2.0.1/work * Applying vsftpd-1.2.1-gentoo.diff.bz2... * Failed Patch: vsftpd-1.2.1-gentoo.diff.bz2! * * Include in your bugreport the contents of: * * /var/tmp/portage/vsftpd-2.0.1/temp/vsftpd-1.2.1-gentoo.diff.bz2-4463.out Here is output from requested file: ***** vsftpd-1.2.1-gentoo.diff.bz2 ***** ======================================== PIPE_COMMAND: bzip2 -dc /usr/portage/net-ftp/vsftpd/files/vsftpd-1.2.1-gentoo.diff.bz2 > /var/tmp/portage/vsftpd-2.0.1/temp/4463.patch PATCH COMMAND: patch -p0 -g0 < /var/tmp/portage/vsftpd-2.0.1/temp/4463.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 -urN vsftpd-1.2.0/defs.h vsftpd-1.2.0-modified/defs.h |--- vsftpd-1.2.0/defs.h 2002-07-09 17:51:57.000000000 -0500 |+++ vsftpd-1.2.0-modified/defs.h 2003-06-09 01:39:26.000000000 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 16 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urN vsftpd-1.2.0/sysdeputil.c vsftpd-1.2.0-modified/sysdeputil.c |--- vsftpd-1.2.0/sysdeputil.c 2003-03-10 17:42:48.000000000 -0600 |+++ vsftpd-1.2.0-modified/sysdeputil.c 2003-06-09 01:40:31.000000000 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 30 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urN vsftpd-1.2.0/tunables.c vsftpd-1.2.0-modified/tunables.c |--- vsftpd-1.2.0/tunables.c 2003-05-27 17:30:06.000000000 -0500 |+++ vsftpd-1.2.0-modified/tunables.c 2003-06-09 01:42:00.000000000 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 59 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urN vsftpd-1.2.0/vsftpd.8 vsftpd-1.2.0-modified/vsftpd.8 |--- vsftpd-1.2.0/vsftpd.8 2002-12-20 12:14:46.000000000 -0600 |+++ vsftpd-1.2.0-modified/vsftpd.8 2003-06-09 01:43:25.000000000 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored can't find file to patch at input line 70 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urN vsftpd-1.2.0/vsftpd.conf.5 vsftpd-1.2.0-modified/vsftpd.conf.5 |--- vsftpd-1.2.0/vsftpd.conf.5 2003-05-27 17:50:28.000000000 -0500 |+++ vsftpd-1.2.0-modified/vsftpd.conf.5 2003-06-09 01:47:28.000000000 -0500 -------------------------- No file to patch. Skipping patch. 11 out of 11 hunks ignored ======================================== PIPE_COMMAND: bzip2 -dc /usr/portage/net-ftp/vsftpd/files/vsftpd-1.2.1-gentoo.diff.bz2 > /var/tmp/portage/vsftpd-2.0.1/temp/4463.patch PATCH COMMAND: patch -p1 -g0 < /var/tmp/portage/vsftpd-2.0.1/temp/4463.patch ======================================== patching file defs.h patching file sysdeputil.c Hunk #1 FAILED at 40. 1 out of 1 hunk FAILED -- saving rejects to file sysdeputil.c.rej patching file tunables.c Hunk #1 succeeded at 87 (offset 11 lines). patching file vsftpd.8 Hunk #1 succeeded at 29 (offset 9 lines). patching file vsftpd.conf.5 Hunk #2 succeeded at 136 (offset 8 lines). Hunk #3 succeeded at 164 (offset 8 lines). Hunk #4 succeeded at 192 (offset 8 lines). Hunk #5 succeeded at 414 with fuzz 1 (offset 97 lines). Hunk #6 succeeded at 494 (offset 107 lines). Hunk #7 succeeded at 635 (offset 107 lines). Hunk #8 succeeded at 664 with fuzz 2 (offset 108 lines). Hunk #9 succeeded at 816 with fuzz 2 (offset 170 lines). Hunk #10 succeeded at 855 (offset 116 lines). Hunk #11 succeeded at 869 (offset 116 lines). ======================================== PIPE_COMMAND: bzip2 -dc /usr/portage/net-ftp/vsftpd/files/vsftpd-1.2.1-gentoo.diff.bz2 > /var/tmp/portage/vsftpd-2.0.1/temp/4463.patch PATCH COMMAND: patch -p2 -g0 < /var/tmp/portage/vsftpd-2.0.1/temp/4463.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 -urN vsftpd-1.2.0/defs.h vsftpd-1.2.0-modified/defs.h |--- vsftpd-1.2.0/defs.h 2002-07-09 17:51:57.000000000 -0500 |+++ vsftpd-1.2.0-modified/defs.h 2003-06-09 01:39:26.000000000 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored missing header for unified diff at line 16 of patch can't find file to patch at input line 16 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urN vsftpd-1.2.0/sysdeputil.c vsftpd-1.2.0-modified/sysdeputil.c |--- vsftpd-1.2.0/sysdeputil.c 2003-03-10 17:42:48.000000000 -0600 |+++ vsftpd-1.2.0-modified/sysdeputil.c 2003-06-09 01:40:31.000000000 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored missing header for unified diff at line 30 of patch can't find file to patch at input line 30 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urN vsftpd-1.2.0/tunables.c vsftpd-1.2.0-modified/tunables.c |--- vsftpd-1.2.0/tunables.c 2003-05-27 17:30:06.000000000 -0500 |+++ vsftpd-1.2.0-modified/tunables.c 2003-06-09 01:42:00.000000000 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored missing header for unified diff at line 59 of patch can't find file to patch at input line 59 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urN vsftpd-1.2.0/vsftpd.8 vsftpd-1.2.0-modified/vsftpd.8 |--- vsftpd-1.2.0/vsftpd.8 2002-12-20 12:14:46.000000000 -0600 |+++ vsftpd-1.2.0-modified/vsftpd.8 2003-06-09 01:43:25.000000000 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored missing header for unified diff at line 70 of patch can't find file to patch at input line 70 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urN vsftpd-1.2.0/vsftpd.conf.5 vsftpd-1.2.0-modified/vsftpd.conf.5 |--- vsftpd-1.2.0/vsftpd.conf.5 2003-05-27 17:50:28.000000000 -0500 |+++ vsftpd-1.2.0-modified/vsftpd.conf.5 2003-06-09 01:47:28.000000000 -0500 -------------------------- No file to patch. Skipping patch. 11 out of 11 hunks ignored ======================================== PIPE_COMMAND: bzip2 -dc /usr/portage/net-ftp/vsftpd/files/vsftpd-1.2.1-gentoo.diff.bz2 > /var/tmp/portage/vsftpd-2.0.1/temp/4463.patch PATCH COMMAND: patch -p3 -g0 < /var/tmp/portage/vsftpd-2.0.1/temp/4463.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 -urN vsftpd-1.2.0/defs.h vsftpd-1.2.0-modified/defs.h |--- vsftpd-1.2.0/defs.h 2002-07-09 17:51:57.000000000 -0500 |+++ vsftpd-1.2.0-modified/defs.h 2003-06-09 01:39:26.000000000 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored missing header for unified diff at line 16 of patch can't find file to patch at input line 16 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urN vsftpd-1.2.0/sysdeputil.c vsftpd-1.2.0-modified/sysdeputil.c |--- vsftpd-1.2.0/sysdeputil.c 2003-03-10 17:42:48.000000000 -0600 |+++ vsftpd-1.2.0-modified/sysdeputil.c 2003-06-09 01:40:31.000000000 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored missing header for unified diff at line 30 of patch can't find file to patch at input line 30 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urN vsftpd-1.2.0/tunables.c vsftpd-1.2.0-modified/tunables.c |--- vsftpd-1.2.0/tunables.c 2003-05-27 17:30:06.000000000 -0500 |+++ vsftpd-1.2.0-modified/tunables.c 2003-06-09 01:42:00.000000000 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored missing header for unified diff at line 59 of patch can't find file to patch at input line 59 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urN vsftpd-1.2.0/vsftpd.8 vsftpd-1.2.0-modified/vsftpd.8 |--- vsftpd-1.2.0/vsftpd.8 2002-12-20 12:14:46.000000000 -0600 |+++ vsftpd-1.2.0-modified/vsftpd.8 2003-06-09 01:43:25.000000000 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored missing header for unified diff at line 70 of patch can't find file to patch at input line 70 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urN vsftpd-1.2.0/vsftpd.conf.5 vsftpd-1.2.0-modified/vsftpd.conf.5 |--- vsftpd-1.2.0/vsftpd.conf.5 2003-05-27 17:50:28.000000000 -0500 |+++ vsftpd-1.2.0-modified/vsftpd.conf.5 2003-06-09 01:47:28.000000000 -0500 -------------------------- No file to patch. Skipping patch. 11 out of 11 hunks ignored ======================================== PIPE_COMMAND: bzip2 -dc /usr/portage/net-ftp/vsftpd/files/vsftpd-1.2.1-gentoo.diff.bz2 > /var/tmp/portage/vsftpd-2.0.1/temp/4463.patch PATCH COMMAND: patch -p4 -g0 < /var/tmp/portage/vsftpd-2.0.1/temp/4463.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 -urN vsftpd-1.2.0/defs.h vsftpd-1.2.0-modified/defs.h |--- vsftpd-1.2.0/defs.h 2002-07-09 17:51:57.000000000 -0500 |+++ vsftpd-1.2.0-modified/defs.h 2003-06-09 01:39:26.000000000 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored missing header for unified diff at line 16 of patch can't find file to patch at input line 16 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urN vsftpd-1.2.0/sysdeputil.c vsftpd-1.2.0-modified/sysdeputil.c |--- vsftpd-1.2.0/sysdeputil.c 2003-03-10 17:42:48.000000000 -0600 |+++ vsftpd-1.2.0-modified/sysdeputil.c 2003-06-09 01:40:31.000000000 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored missing header for unified diff at line 30 of patch can't find file to patch at input line 30 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urN vsftpd-1.2.0/tunables.c vsftpd-1.2.0-modified/tunables.c |--- vsftpd-1.2.0/tunables.c 2003-05-27 17:30:06.000000000 -0500 |+++ vsftpd-1.2.0-modified/tunables.c 2003-06-09 01:42:00.000000000 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored missing header for unified diff at line 59 of patch can't find file to patch at input line 59 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urN vsftpd-1.2.0/vsftpd.8 vsftpd-1.2.0-modified/vsftpd.8 |--- vsftpd-1.2.0/vsftpd.8 2002-12-20 12:14:46.000000000 -0600 |+++ vsftpd-1.2.0-modified/vsftpd.8 2003-06-09 01:43:25.000000000 -0500 -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored missing header for unified diff at line 70 of patch can't find file to patch at input line 70 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff -urN vsftpd-1.2.0/vsftpd.conf.5 vsftpd-1.2.0-modified/vsftpd.conf.5 |--- vsftpd-1.2.0/vsftpd.conf.5 2003-05-27 17:50:28.000000000 -0500 |+++ vsftpd-1.2.0-modified/vsftpd.conf.5 2003-06-09 01:47:28.000000000 -0500 -------------------------- No file to patch. Skipping patch. 11 out of 11 hunks ignored Reproducible: Always Steps to Reproduce: 1.emerge -uv vfstpd 2. 3. Expected Results: Compiled
This also happens on the x86 platform. Same error message.
Removing the patch entirely allows the emerge to succeed. Extract from ebuild file: src_unpack() { filter-flags "-fPIC" unpack ${A} || die cd ${S} || die # epatch ${FILESDIR}/${PN}-1.2.1-gentoo.diff.bz2 || die use tcpd && echo '#define VSF_BUILD_TCPWRAPPERS' >> builddefs.h use ssl && echo '#define VSF_BUILD_SSL' >> builddefs.h } Maybe that is all that is needed. Besides, if we are patching 2.0.1, we should use a patch file with 2.0.1 in it, and not 1.2.1
Someone please change the hardware for this bug to All, as it happens on X86, as well as AMD64, and by the looks of the bug more than just those arch's :)
Ironic: Yeah, the patch for version 1.2 cant work for version 2.x. Someone modified the sources! Maybe the vsftpd-team? :) Seriously: It cant work. I ported the it to version 2. See the attachment. One thing I am not sure about is in file sysdeputil.c. Version 2 states #ifdef VSF_BUILD_PAM on line 50. The patch for version 1.2 sets #ifdef USE_PAM. Can someone point out the differences, please? Thanks in advance.
Created attachment 40280 [details] Patch for gentoo-specific paths to vsftpd Adopted gentoo-diff from version 1.2 to version 2.0
Hey guys, I added the patch so nicely provided by Stefan Platner. Committed to portage, so should see it in a bit. Test away. Thanks! -Jeffrey
