Bug 1585063 - patchutils: filterdiff drops some git-style diffs
Summary: patchutils: filterdiff drops some git-style diffs
Keywords:
Status: CLOSED EOL
Alias: None
Product: Fedora
Classification: Fedora
Component: patchutils
Version: 30
Hardware: Unspecified
OS: Unspecified
unspecified
unspecified
Target Milestone: ---
Assignee: Tim Waugh
QA Contact: Fedora Extras Quality Assurance
URL:
Whiteboard:
Depends On:
Blocks:
TreeView+ depends on / blocked
 
Reported: 2018-06-01 08:40 UTC by Florian Weimer
Modified: 2020-05-26 17:21 UTC (History)
1 user (show)

Fixed In Version:
Doc Type: If docs needed, set a value
Doc Text:
Clone Of:
Environment:
Last Closed: 2020-05-26 17:21:02 UTC
Type: Bug
Embargoed:


Attachments (Terms of Use)
Input patch file (764 bytes, text/plain)
2018-06-01 08:40 UTC, Florian Weimer
no flags Details

Description Florian Weimer 2018-06-01 08:40:34 UTC
Created attachment 1446567 [details]
Input patch file

“filterdiff -x a/ChangeLog patch“ with the attached file outputs this:

commit 48dde5faed3fdb70ee1e045cc3bc8a2a276d33bb
Author: Florian Weimer <fweimer>
Date:   Fri Jun 1 00:12:03 2018 +0200

    Remove sysdeps/generic/libcidn.abilist
    
    This file was left behind by the libidn removal in commit
    7f9f1ecb710eac4d65bb02785ddf288cac098323.

The other patch is missing:

diff --git a/sysdeps/generic/libcidn.abilist b/sysdeps/generic/libcidn.abilist
deleted file mode 100644
index e69de29bb2..0000000000

Seen with patchutils-0.3.4-9.fc27.x86_64.

Comment 1 Florian Weimer 2018-07-03 09:44:13 UTC
There is a related problem.  This patch:

diff --git a/sysdeps/init_array/pt-crti.S b/sysdeps/riscv/platform-params.h
similarity index 70%
rename from sysdeps/init_array/pt-crti.S
rename to sysdeps/riscv/platform-params.h
index 9bf17059dd..b71591437d 100644
--- a/sysdeps/init_array/pt-crti.S
+++ b/sysdeps/riscv/platform-params.h
@@ -1,5 +1,5 @@
-/* Special initializer support for libpthread.
-   Copyright (C) 2015-2018 Free Software Foundation, Inc.
+/* Various definitions for specifying platform behavior.  RISC_V version.
+   Copyright (C) 2018 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -16,8 +16,10 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-/* This arranges for libpthread.so's special initializer to be called as
-   soon as the library is loaded.  */
+#ifndef _PLATFORM_PARAMS_H
+#define _PLATFORM_PARAMS_H
 
-       .section .init_array,"a",%init_array
-       .dc.a __pthread_initialize_minimal_internal
+/* RISC-V does not have .init/.fini.  */
+#define ELF_INITFINI 0
+
+#endif /* _PLATFORM_PARAMS_H */

Turns into:

diff --git a/sysdeps/init_array/pt-crti.S b/sysdeps/riscv/platform-params.h
similarity index 70%
rename from sysdeps/init_array/pt-crti.S
rename to sysdeps/riscv/platform-params.h
+++ b/sysdeps/riscv/platform-params.h
@@ -1,5 +1,5 @@
-/* Special initializer support for libpthread.
-   Copyright (C) 2015-2018 Free Software Foundation, Inc.
+/* Various definitions for specifying platform behavior.  RISC_V version.
…

So the --- line is dropped, which means that patch is no longer able to apply the patch.

Comment 2 Ben Cotton 2018-11-27 15:02:53 UTC
This message is a reminder that Fedora 27 is nearing its end of life.
On 2018-Nov-30  Fedora will stop maintaining and issuing updates for
Fedora 27. It is Fedora's policy to close all bug reports from releases
that are no longer maintained. At that time this bug will be closed as
EOL if it remains open with a Fedora  'version' of '27'.

Package Maintainer: If you wish for this bug to remain open because you
plan to fix it in a currently maintained version, simply change the 'version' 
to a later Fedora version.

Thank you for reporting this issue and we are sorry that we were not 
able to fix it before Fedora 27 is end of life. If you would still like 
to see this bug fixed and are able to reproduce it against a later version 
of Fedora, you are encouraged  change the 'version' to a later Fedora 
version prior this bug is closed as described in the policy above.

Although we aim to fix as many bugs as possible during every release's 
lifetime, sometimes those efforts are overtaken by events. Often a 
more recent Fedora release includes newer upstream software that fixes 
bugs or makes them obsolete.

Comment 3 Ben Cotton 2018-11-30 22:07:23 UTC
Fedora 27 changed to end-of-life (EOL) status on 2018-11-30. Fedora 27 is
no longer maintained, which means that it will not receive any further
security or bug fix updates. As a result we are closing this bug.

If you can reproduce this bug against a currently maintained version of
Fedora please feel free to reopen this bug against that version. If you
are unable to reopen this bug, please file a new report against the
current release. If you experience problems, please add a comment to this
bug.

Thank you for reporting this bug and we are sorry it could not be fixed.

Comment 4 Florian Weimer 2019-10-01 17:41:39 UTC
Still present in patchutils-0.3.4-13.fc30.x86_64.

Comment 5 Ben Cotton 2020-04-30 21:01:47 UTC
This message is a reminder that Fedora 30 is nearing its end of life.
Fedora will stop maintaining and issuing updates for Fedora 30 on 2020-05-26.
It is Fedora's policy to close all bug reports from releases that are no longer
maintained. At that time this bug will be closed as EOL if it remains open with a
Fedora 'version' of '30'.

Package Maintainer: If you wish for this bug to remain open because you
plan to fix it in a currently maintained version, simply change the 'version' 
to a later Fedora version.

Thank you for reporting this issue and we are sorry that we were not 
able to fix it before Fedora 30 is end of life. If you would still like 
to see this bug fixed and are able to reproduce it against a later version 
of Fedora, you are encouraged  change the 'version' to a later Fedora 
version prior this bug is closed as described in the policy above.

Although we aim to fix as many bugs as possible during every release's 
lifetime, sometimes those efforts are overtaken by events. Often a 
more recent Fedora release includes newer upstream software that fixes 
bugs or makes them obsolete.

Comment 6 Ben Cotton 2020-05-26 17:21:02 UTC
Fedora 30 changed to end-of-life (EOL) status on 2020-05-26. Fedora 30 is
no longer maintained, which means that it will not receive any further
security or bug fix updates. As a result we are closing this bug.

If you can reproduce this bug against a currently maintained version of
Fedora please feel free to reopen this bug against that version. If you
are unable to reopen this bug, please file a new report against the
current release. If you experience problems, please add a comment to this
bug.

Thank you for reporting this bug and we are sorry it could not be fixed.


Note You need to log in before you can comment on or make changes to this bug.