From 3992a6874b75ce8ae06dbd74f67331dbb7bd6e56 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 7 Jul 2017 11:39:07 +0200 Subject: [PATCH] Fix brokeness when using %filter_setup (RHBZ #1468476) Signed-off-by: Igor Gnatenko --- ...rrect-source-file-for-rpmsign-module.patch | 2 +- ...ompile-Process-python-lib-dirs-even-.patch | 2 +- ...umber-of-references-on-spec_Type-114.patch | 2 +- ...ld-id-links-to-rpm-for-all-ELF-files.patch | 2 +- ...-to-have-unique-build-ids-across-bui.patch | 2 +- ...ding-GDB-index-sections-configurable.patch | 2 +- ...ve-unique-debug-file-names-across-ve.patch | 2 +- ...or-when-_build_id_links-is-undefined.patch | 2 +- ...c-when-subpackages-have-different-ve.patch | 2 +- ...ular-files-when-generating-build-ids.patch | 2 +- ...re.ac-use-LIBDW-always-conditionally.patch | 2 +- 0012-Fix-libdw-configure-check.patch | 2 +- ...t-String-Line-table-rewriting-for-la.patch | 2 +- ...ve-unique-debug-source-dirs-across-v.patch | 2 +- ...-Don-t-warn-or-error-for-object-file.patch | 2 +- ...set-__debug_package-implies-missing-.patch | 2 +- ...-generateBuildIDs-Fix-error-handling.patch | 2 +- ...et-file-attributes-for-generated-bui.patch | 2 +- ...-Reset-attrFlags-in-generateBuildIDs.patch | 2 +- ...it_dwarf2_line-replace_dirs-replace_.patch | 2 +- ...ocessPackageFiles-Don-t-call-generat.patch | 2 +- ...oss-endian-build-id-reading-and-upda.patch | 2 +- ...t-Make-file-sed-regexp-more-strict-t.patch | 2 +- ....at-Make-file-sed-regexp-more-strict.patch | 2 +- ...ly-check-build-ids-for-executable-fi.patch | 2 +- ...f-by-one-adding-DW_FORM_string-repla.patch | 2 +- ...nbreak-short-circuited-binary-builds.patch | 2 +- ...h-Only-add-minisymtab-for-executable.patch | 2 +- ...ebugedit-Add-n-no-recompute-build-id.patch | 2 +- ...-inherented-modes-of-directories-in-.patch | 2 +- ...output-comp_dir-under-build-dir-once.patch | 2 +- ...h-Split-directory-traversal-and-debu.patch | 2 +- ...h-Use-return-not-continue-to-break-o.patch | 2 +- ...buginfo.sh-Process-files-in-parallel.patch | 2 +- ...e-build-options-in-find-debuginfo.sh.patch | 2 +- 0036-Support-debugsource-subpackages.patch | 2 +- 0037-Support-debuginfo-subpackages.patch | 2 +- ...ectories-to-split-debuginfo-packages.patch | 2 +- ...ir_prefix-should-check-for-dir-separ.patch | 2 +- ...h-Filter-out-all-built-in-like-fake-.patch | 2 +- ...h-Don-t-create-dwz-multi-file-if-the.patch | 2 +- ...ginfo.sh-options-and-macros-document.patch | 2 +- ...SL-support-for-digest-and-signatures.patch | 2 +- ...-instead-of-RPMTAG_-FLAGS-in-parsePr.patch | 2 +- ...ak-deps-in-external-dependency-gener.patch | 2 +- ...er-to-allow-rich-deps-in-a-given-tag.patch | 2 +- ...ependecies-for-build-requires-and-co.patch | 2 +- ...rich-dependencies-from-dependency-ge.patch | 2 +- ...-index-when-recording-generated-depe.patch | 2 +- ...ttr-attr-root-root-generation-to-hel.patch | 6 ++-- ...file-list-processing-in-separate-fun.patch | 6 ++-- ...ist-to-add-build-id-files-to-pkgList.patch | 6 ++-- ...-always-create-a-defattr-with-explic.patch | 6 ++-- 0054-rpmfc-fix-ternary-operator.patch | 30 +++++++++++++++++++ rpm.spec | 9 +++++- 55 files changed, 99 insertions(+), 62 deletions(-) create mode 100644 0054-rpmfc-fix-ternary-operator.patch diff --git a/0001-Use-correct-source-file-for-rpmsign-module.patch b/0001-Use-correct-source-file-for-rpmsign-module.patch index 9c02b6a..a5f1d4f 100644 --- a/0001-Use-correct-source-file-for-rpmsign-module.patch +++ b/0001-Use-correct-source-file-for-rpmsign-module.patch @@ -1,7 +1,7 @@ From 3936d5a227dfcfd502588c6fd8f52ccb826f11c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Wed, 20 Apr 2016 15:39:36 +0200 -Subject: [PATCH 01/49] Use correct source file for rpmsign module +Subject: [PATCH 01/54] Use correct source file for rpmsign module (cherry picked from commit eb632e5158fa4ef993b0e5df2a354f0be7a7a71d) --- diff --git a/0002-brp-python-bytecompile-Process-python-lib-dirs-even-.patch b/0002-brp-python-bytecompile-Process-python-lib-dirs-even-.patch index 00d41d9..346c6fe 100644 --- a/0002-brp-python-bytecompile-Process-python-lib-dirs-even-.patch +++ b/0002-brp-python-bytecompile-Process-python-lib-dirs-even-.patch @@ -1,7 +1,7 @@ From aa74f749e8eba102069aaafd0b2e18af8f5f0fa0 Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Tue, 14 Feb 2017 14:04:35 +0100 -Subject: [PATCH 02/49] brp-python-bytecompile: Process python lib dirs even +Subject: [PATCH 02/54] brp-python-bytecompile: Process python lib dirs even without standard Python There is no need for /usr/bin/python when byte compiling files in diff --git a/0003-Fix-number-of-references-on-spec_Type-114.patch b/0003-Fix-number-of-references-on-spec_Type-114.patch index 3774d3d..3759111 100644 --- a/0003-Fix-number-of-references-on-spec_Type-114.patch +++ b/0003-Fix-number-of-references-on-spec_Type-114.patch @@ -1,7 +1,7 @@ From 6e748a4eb167b2ca201d9e90b927cc4523eabeda Mon Sep 17 00:00:00 2001 From: Pavlina Moravcova Varekova Date: Tue, 21 Feb 2017 11:48:27 +0100 -Subject: [PATCH 03/49] Fix number of references on spec_Type (#114) +Subject: [PATCH 03/54] Fix number of references on spec_Type (#114) After creating a specPkg from a spec file we must increase spec file reference counter. Otherwise spec file may be accidentally deallocated diff --git a/0004-Add-build-id-links-to-rpm-for-all-ELF-files.patch b/0004-Add-build-id-links-to-rpm-for-all-ELF-files.patch index ea77b8b..b8133fd 100644 --- a/0004-Add-build-id-links-to-rpm-for-all-ELF-files.patch +++ b/0004-Add-build-id-links-to-rpm-for-all-ELF-files.patch @@ -1,7 +1,7 @@ From 46b763e54de34d0dd28d82e3a87b59c6a94a4c07 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Tue, 14 Jun 2016 17:07:12 +0200 -Subject: [PATCH 04/49] Add build-id links to rpm for all ELF files. +Subject: [PATCH 04/54] Add build-id links to rpm for all ELF files. This patch moves the main ELF file build-id symlinks from the debuginfo package into the main package. And uses different diff --git a/0005-Make-it-possible-to-have-unique-build-ids-across-bui.patch b/0005-Make-it-possible-to-have-unique-build-ids-across-bui.patch index 723fd96..b540283 100644 --- a/0005-Make-it-possible-to-have-unique-build-ids-across-bui.patch +++ b/0005-Make-it-possible-to-have-unique-build-ids-across-bui.patch @@ -1,7 +1,7 @@ From 3edae790572203f07a28448fedfda82d0629f4fb Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Tue, 14 Jun 2016 17:07:13 +0200 -Subject: [PATCH 05/49] Make it possible to have unique build-ids across build +Subject: [PATCH 05/54] Make it possible to have unique build-ids across build versions/releases. Introduce a new macro _unique_build_ids that when set will pass the diff --git a/0006-Make-adding-GDB-index-sections-configurable.patch b/0006-Make-adding-GDB-index-sections-configurable.patch index 1842ada..6b2b982 100644 --- a/0006-Make-adding-GDB-index-sections-configurable.patch +++ b/0006-Make-adding-GDB-index-sections-configurable.patch @@ -1,7 +1,7 @@ From 68a0323ab1738aee40f9f5a60a7fb3163162bf39 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Tue, 14 Jun 2016 17:07:14 +0200 -Subject: [PATCH 06/49] Make adding GDB index sections configurable. +Subject: [PATCH 06/54] Make adding GDB index sections configurable. Introduces _include_gdb_index macro and -i flag to find-debuginfo.sh to enable or disable adding a .gdb_index section to debug files. Adds tests diff --git a/0007-Add-option-to-have-unique-debug-file-names-across-ve.patch b/0007-Add-option-to-have-unique-debug-file-names-across-ve.patch index 6a6fe07..03fb41b 100644 --- a/0007-Add-option-to-have-unique-debug-file-names-across-ve.patch +++ b/0007-Add-option-to-have-unique-debug-file-names-across-ve.patch @@ -1,7 +1,7 @@ From 5b29c09c31982a712844cb2bbcd0bfff09c457d1 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 16 Jun 2016 14:24:22 +0200 -Subject: [PATCH 07/49] Add option to have unique debug file names across +Subject: [PATCH 07/54] Add option to have unique debug file names across version/release/arch. Introduce a new macro _unique_debug_names that when set will pass diff --git a/0008-Fix-behavior-when-_build_id_links-is-undefined.patch b/0008-Fix-behavior-when-_build_id_links-is-undefined.patch index 4d54ee7..c943351 100644 --- a/0008-Fix-behavior-when-_build_id_links-is-undefined.patch +++ b/0008-Fix-behavior-when-_build_id_links-is-undefined.patch @@ -1,7 +1,7 @@ From a040e812b39d1fcc6aa69ca6aa5ff2fe4316a018 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 3 Oct 2016 12:36:46 +0300 -Subject: [PATCH 08/49] Fix behavior when %_build_id_links is undefined +Subject: [PATCH 08/54] Fix behavior when %_build_id_links is undefined Commit bbfe1f86b2e4b5c0bd499d9f3dd9de9c9c20fff2 tries to behave sanely and use compat setting when %_build_id_links is undefined, but diff --git a/0009-Fix-debuginfo-etc-when-subpackages-have-different-ve.patch b/0009-Fix-debuginfo-etc-when-subpackages-have-different-ve.patch index cc9c765..0a04b2c 100644 --- a/0009-Fix-debuginfo-etc-when-subpackages-have-different-ve.patch +++ b/0009-Fix-debuginfo-etc-when-subpackages-have-different-ve.patch @@ -1,7 +1,7 @@ From 932c2170e961d393569992b2f9c3ab8ee415f01b Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Wed, 9 Nov 2016 09:16:48 +0200 -Subject: [PATCH 09/49] Fix debuginfo etc when subpackages have different +Subject: [PATCH 09/54] Fix debuginfo etc when subpackages have different versions (RhBug:1051407) Rpm has always been a bit dazed and confused when it comes to specs diff --git a/0010-Only-process-regular-files-when-generating-build-ids.patch b/0010-Only-process-regular-files-when-generating-build-ids.patch index e5905ab..0db28d6 100644 --- a/0010-Only-process-regular-files-when-generating-build-ids.patch +++ b/0010-Only-process-regular-files-when-generating-build-ids.patch @@ -1,7 +1,7 @@ From 29f756e3fba09f6a66515970978367829862f35c Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 5 Jan 2017 12:13:54 +0200 -Subject: [PATCH 10/49] Only process regular files when generating build-ids +Subject: [PATCH 10/54] Only process regular files when generating build-ids Versioned shared libraries typically have several symlinks pointing to them directly and indirectly. When %_build_id_links is set to compat or diff --git a/0011-configure.ac-use-LIBDW-always-conditionally.patch b/0011-configure.ac-use-LIBDW-always-conditionally.patch index 12bf77b..9021184 100644 --- a/0011-configure.ac-use-LIBDW-always-conditionally.patch +++ b/0011-configure.ac-use-LIBDW-always-conditionally.patch @@ -1,7 +1,7 @@ From 1b34b839b788264ffcd3ab90a0612cad3b843f7f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 10 Aug 2016 13:58:30 +0200 -Subject: [PATCH 11/49] configure.ac: use LIBDW always conditionally +Subject: [PATCH 11/54] configure.ac: use LIBDW always conditionally References: https://bugzilla.redhat.com/show_bug.cgi?id=1365278 Reported-and-tested-by: Neal Gompa diff --git a/0012-Fix-libdw-configure-check.patch b/0012-Fix-libdw-configure-check.patch index 3dd3bf9..62ecddb 100644 --- a/0012-Fix-libdw-configure-check.patch +++ b/0012-Fix-libdw-configure-check.patch @@ -1,7 +1,7 @@ From f41a0a8c6839e3962e10a7bd3aad39127a764748 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Wed, 24 Aug 2016 17:06:34 +0200 -Subject: [PATCH 12/49] Fix libdw configure check. +Subject: [PATCH 12/54] Fix libdw configure check. commit a82119 "configure.ac: use LIBDW always conditionally" contained a typo that caused WITH_LIBDW_LIB never to be set when you were using diff --git a/0013-debugedit-Support-String-Line-table-rewriting-for-la.patch b/0013-debugedit-Support-String-Line-table-rewriting-for-la.patch index bff97f4..a4d423a 100644 --- a/0013-debugedit-Support-String-Line-table-rewriting-for-la.patch +++ b/0013-debugedit-Support-String-Line-table-rewriting-for-la.patch @@ -1,7 +1,7 @@ From ddb7c4abddd746d7ec354fb89be16a2411a92cba Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Mon, 27 Feb 2017 16:28:18 +0100 -Subject: [PATCH 13/49] debugedit: Support String/Line table rewriting for +Subject: [PATCH 13/54] debugedit: Support String/Line table rewriting for larger/smaller paths. debugedit --base to --dest rewriting of debug source file paths only diff --git a/0014-Add-option-to-have-unique-debug-source-dirs-across-v.patch b/0014-Add-option-to-have-unique-debug-source-dirs-across-v.patch index 05b1625..6a6e6c1 100644 --- a/0014-Add-option-to-have-unique-debug-source-dirs-across-v.patch +++ b/0014-Add-option-to-have-unique-debug-source-dirs-across-v.patch @@ -1,7 +1,7 @@ From 0febf191cc874a822f045c24587d412e4d0ec33c Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Tue, 28 Feb 2017 21:34:34 +0100 -Subject: [PATCH 14/49] Add option to have unique debug source dirs across +Subject: [PATCH 14/54] Add option to have unique debug source dirs across version/release/arch. Introduce a new macro _unique_debug_srcs that when set will pass diff --git a/0015-generateBuildIDs-Don-t-warn-or-error-for-object-file.patch b/0015-generateBuildIDs-Don-t-warn-or-error-for-object-file.patch index e6f282f..61971ca 100644 --- a/0015-generateBuildIDs-Don-t-warn-or-error-for-object-file.patch +++ b/0015-generateBuildIDs-Don-t-warn-or-error-for-object-file.patch @@ -1,7 +1,7 @@ From 590081d625b22b5845015949ecb184989377c928 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 9 Mar 2017 09:34:01 +0100 -Subject: [PATCH 15/49] generateBuildIDs: Don't warn or error for object files +Subject: [PATCH 15/54] generateBuildIDs: Don't warn or error for object files without build-id. Only loadable ELF images (executables, shared libraries, kernel modules) diff --git a/0016-build-files.c-Unset-__debug_package-implies-missing-.patch b/0016-build-files.c-Unset-__debug_package-implies-missing-.patch index 99e6646..9e99951 100644 --- a/0016-build-files.c-Unset-__debug_package-implies-missing-.patch +++ b/0016-build-files.c-Unset-__debug_package-implies-missing-.patch @@ -1,7 +1,7 @@ From 5bc9efa303efe933b02cc8679ef3134668839831 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 9 Mar 2017 15:52:12 +0100 -Subject: [PATCH 16/49] build/files.c: Unset __debug_package implies missing +Subject: [PATCH 16/54] build/files.c: Unset __debug_package implies missing build-ids aren't fatal. Historically we have only checked build_ids when __debug_package was diff --git a/0017-generateBuildIDs-Fix-error-handling.patch b/0017-generateBuildIDs-Fix-error-handling.patch index b3885d3..ec62635 100644 --- a/0017-generateBuildIDs-Fix-error-handling.patch +++ b/0017-generateBuildIDs-Fix-error-handling.patch @@ -1,7 +1,7 @@ From fa61c840ba6be18c6579b247605634c1e2a320f8 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 9 Mar 2017 22:13:01 +0100 -Subject: [PATCH 17/49] generateBuildIDs: Fix error handling. +Subject: [PATCH 17/54] generateBuildIDs: Fix error handling. commit e6bdf7 made it so that we don't give a warning or error message for non-kernel ET_REL object files with missing or bad build-ids. But diff --git a/0018-Make-sure-to-reset-file-attributes-for-generated-bui.patch b/0018-Make-sure-to-reset-file-attributes-for-generated-bui.patch index 06535cb..2da3c6c 100644 --- a/0018-Make-sure-to-reset-file-attributes-for-generated-bui.patch +++ b/0018-Make-sure-to-reset-file-attributes-for-generated-bui.patch @@ -1,7 +1,7 @@ From 651264c51dfb13bf78bb969a429719f301497631 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Wed, 15 Mar 2017 20:07:29 +0100 -Subject: [PATCH 18/49] Make sure to reset file attributes for generated +Subject: [PATCH 18/54] Make sure to reset file attributes for generated build-id directories. [Note this patch is currently being tested in Fedora. See bug below.] diff --git a/0019-rpmbuild-Reset-attrFlags-in-generateBuildIDs.patch b/0019-rpmbuild-Reset-attrFlags-in-generateBuildIDs.patch index 1658dc1..3bc985b 100644 --- a/0019-rpmbuild-Reset-attrFlags-in-generateBuildIDs.patch +++ b/0019-rpmbuild-Reset-attrFlags-in-generateBuildIDs.patch @@ -1,7 +1,7 @@ From 20636f4358db0cb85f2251333190626dc2e4ee02 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 19 May 2017 23:11:39 +0200 -Subject: [PATCH 19/49] rpmbuild: Reset attrFlags in generateBuildIDs. +Subject: [PATCH 19/54] rpmbuild: Reset attrFlags in generateBuildIDs. Debuginfo directories and files could be marked as configuration files if the file list ended with a config file. diff --git a/0020-debugedit-Fix-edit_dwarf2_line-replace_dirs-replace_.patch b/0020-debugedit-Fix-edit_dwarf2_line-replace_dirs-replace_.patch index 996caff..5f5ec9d 100644 --- a/0020-debugedit-Fix-edit_dwarf2_line-replace_dirs-replace_.patch +++ b/0020-debugedit-Fix-edit_dwarf2_line-replace_dirs-replace_.patch @@ -1,7 +1,7 @@ From 8e74618100580a1370b9045296c4d2d37340735f Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 16 Mar 2017 22:53:54 +0100 -Subject: [PATCH 20/49] debugedit: Fix edit_dwarf2_line replace_dirs -> +Subject: [PATCH 20/54] debugedit: Fix edit_dwarf2_line replace_dirs -> replace_files typo. We wouldn't replace the changed file names if replace_dirs was false, diff --git a/0021-build-files.c-processPackageFiles-Don-t-call-generat.patch b/0021-build-files.c-processPackageFiles-Don-t-call-generat.patch index 37513c3..13d6635 100644 --- a/0021-build-files.c-processPackageFiles-Don-t-call-generat.patch +++ b/0021-build-files.c-processPackageFiles-Don-t-call-generat.patch @@ -1,7 +1,7 @@ From 430f012c5794873a84db81b93c5858ca96ea4559 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 17 Mar 2017 11:14:00 +0100 -Subject: [PATCH 21/49] build/files.c (processPackageFiles): Don't call +Subject: [PATCH 21/54] build/files.c (processPackageFiles): Don't call generateBuildIDs for noarch. We don't want to do build-id processing for noarch packages. It might be diff --git a/0022-debugedit-Fix-cross-endian-build-id-reading-and-upda.patch b/0022-debugedit-Fix-cross-endian-build-id-reading-and-upda.patch index 0f04113..582539c 100644 --- a/0022-debugedit-Fix-cross-endian-build-id-reading-and-upda.patch +++ b/0022-debugedit-Fix-cross-endian-build-id-reading-and-upda.patch @@ -1,7 +1,7 @@ From 5598e24ef8aef14727ff72eea71ec460200bc2e3 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 17 Mar 2017 21:03:35 +0100 -Subject: [PATCH 22/49] debugedit: Fix cross-endian build-id reading and +Subject: [PATCH 22/54] debugedit: Fix cross-endian build-id reading and updating section data. debugedit doesn't read raw mmap data any longer. Which made the complex diff --git a/0023-tests-tpmbuild.at-Make-file-sed-regexp-more-strict-t.patch b/0023-tests-tpmbuild.at-Make-file-sed-regexp-more-strict-t.patch index 09bdeaf..ee07352 100644 --- a/0023-tests-tpmbuild.at-Make-file-sed-regexp-more-strict-t.patch +++ b/0023-tests-tpmbuild.at-Make-file-sed-regexp-more-strict-t.patch @@ -1,7 +1,7 @@ From 8cd45c82a968404929e00dce65644f81e906591b Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 3 Mar 2017 23:51:13 +0100 -Subject: [PATCH 23/49] tests/tpmbuild.at: Make file sed regexp more strict to +Subject: [PATCH 23/54] tests/tpmbuild.at: Make file sed regexp more strict to extract BuildID. In some testcases we extract the BuildID with the file command. diff --git a/0024-tests-rpmbuildid.at-Make-file-sed-regexp-more-strict.patch b/0024-tests-rpmbuildid.at-Make-file-sed-regexp-more-strict.patch index 751e539..238b654 100644 --- a/0024-tests-rpmbuildid.at-Make-file-sed-regexp-more-strict.patch +++ b/0024-tests-rpmbuildid.at-Make-file-sed-regexp-more-strict.patch @@ -1,7 +1,7 @@ From 58f2b095c0d1507ad09990669f1ae03f6f1d931f Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Mon, 20 Mar 2017 09:55:44 +0100 -Subject: [PATCH 24/49] tests/rpmbuildid.at: Make file sed regexp more strict +Subject: [PATCH 24/54] tests/rpmbuildid.at: Make file sed regexp more strict to extract BuildID. Like commit f0a5819 for rpmbuild.at. In the case of rpmbuildid.at the diff --git a/0025-build-files.c-Only-check-build-ids-for-executable-fi.patch b/0025-build-files.c-Only-check-build-ids-for-executable-fi.patch index 93c0662..b1eb9d4 100644 --- a/0025-build-files.c-Only-check-build-ids-for-executable-fi.patch +++ b/0025-build-files.c-Only-check-build-ids-for-executable-fi.patch @@ -1,7 +1,7 @@ From c21bf3aefdcfb22bc3f41888ef090c6d5a45baec Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Mon, 20 Mar 2017 11:52:00 +0100 -Subject: [PATCH 25/49] build/files.c: Only check build-ids for executable +Subject: [PATCH 25/54] build/files.c: Only check build-ids for executable files in the main package. generateBuildIDs should mimic what find-debuginfo.sh does. Only check diff --git a/0026-debugedit-Fix-off-by-one-adding-DW_FORM_string-repla.patch b/0026-debugedit-Fix-off-by-one-adding-DW_FORM_string-repla.patch index 0209e61..184683c 100644 --- a/0026-debugedit-Fix-off-by-one-adding-DW_FORM_string-repla.patch +++ b/0026-debugedit-Fix-off-by-one-adding-DW_FORM_string-repla.patch @@ -1,7 +1,7 @@ From 419ae36f2c0dad195737982b446fcace507d0814 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Tue, 21 Mar 2017 16:57:44 +0100 -Subject: [PATCH 26/49] debugedit: Fix off-by-one adding DW_FORM_string +Subject: [PATCH 26/54] debugedit: Fix off-by-one adding DW_FORM_string replacement slashes. We would put one too many slashes in between the new dest_dir and file name diff --git a/0027-Unbreak-short-circuited-binary-builds.patch b/0027-Unbreak-short-circuited-binary-builds.patch index 36fda10..8b42e51 100644 --- a/0027-Unbreak-short-circuited-binary-builds.patch +++ b/0027-Unbreak-short-circuited-binary-builds.patch @@ -1,7 +1,7 @@ From 6328e1e0da3ba26885f095ccbd83d223d5830527 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 5 Jan 2017 13:47:28 +0200 -Subject: [PATCH 27/49] Unbreak short-circuited binary builds +Subject: [PATCH 27/54] Unbreak short-circuited binary builds Commit bbfe1f86b2e4b5c0bd499d9f3dd9de9c9c20fff2 broke short-circuited binary builds (which can be handy for testing when working on large diff --git a/0028-find-debuginfo.sh-Only-add-minisymtab-for-executable.patch b/0028-find-debuginfo.sh-Only-add-minisymtab-for-executable.patch index 173a38b..cf97825 100644 --- a/0028-find-debuginfo.sh-Only-add-minisymtab-for-executable.patch +++ b/0028-find-debuginfo.sh-Only-add-minisymtab-for-executable.patch @@ -1,7 +1,7 @@ From 349489c3219e31efd552d87e255b06a864d1c034 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sun, 16 Apr 2017 18:16:02 +0200 -Subject: [PATCH 28/49] find-debuginfo.sh: Only add minisymtab for executables +Subject: [PATCH 28/54] find-debuginfo.sh: Only add minisymtab for executables or shared libraries. It only makes sense to add a minisymtab for executables and shared diff --git a/0029-debugedit-Add-n-no-recompute-build-id.patch b/0029-debugedit-Add-n-no-recompute-build-id.patch index 68169b0..8a51879 100644 --- a/0029-debugedit-Add-n-no-recompute-build-id.patch +++ b/0029-debugedit-Add-n-no-recompute-build-id.patch @@ -1,7 +1,7 @@ From 525282b9a8b78c2890c752e45c4dc7dcf25f42cb Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Sun, 16 Apr 2017 18:16:46 +0200 -Subject: [PATCH 29/49] debugedit: Add -n, --no-recompute-build-id. +Subject: [PATCH 29/54] debugedit: Add -n, --no-recompute-build-id. Some packages depend on the build-ids as generated during the build and cannot handle rpmbuild recomputing them before generating the diff --git a/0030-Fix-non-standard-inherented-modes-of-directories-in-.patch b/0030-Fix-non-standard-inherented-modes-of-directories-in-.patch index 2ac432a..61c6491 100644 --- a/0030-Fix-non-standard-inherented-modes-of-directories-in-.patch +++ b/0030-Fix-non-standard-inherented-modes-of-directories-in-.patch @@ -1,7 +1,7 @@ From ba8f2239de528f02d272aed71599a4a560ddd238 Mon Sep 17 00:00:00 2001 From: Robin Lee Date: Sat, 8 Apr 2017 21:21:39 +0800 -Subject: [PATCH 30/49] Fix non-standard inherented modes of directories in +Subject: [PATCH 30/54] Fix non-standard inherented modes of directories in debuginfo In case that binary compiled from source generated in /tmp, a diff --git a/0031-debugedit-Only-output-comp_dir-under-build-dir-once.patch b/0031-debugedit-Only-output-comp_dir-under-build-dir-once.patch index 99891e7..59c9349 100644 --- a/0031-debugedit-Only-output-comp_dir-under-build-dir-once.patch +++ b/0031-debugedit-Only-output-comp_dir-under-build-dir-once.patch @@ -1,7 +1,7 @@ From 387acd5cb74c968b4751a1c2c731964fc1ab6c3f Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Fri, 21 Apr 2017 17:33:26 +0200 -Subject: [PATCH 31/49] debugedit: Only output comp_dir under build dir (once). +Subject: [PATCH 31/54] debugedit: Only output comp_dir under build dir (once). The fix for rhbz#444310 (commit c1a5eb - Include empty CU current dirs) was a little greedy. It would also include comp_dirs outside the build diff --git a/0032-find-debuginfo.sh-Split-directory-traversal-and-debu.patch b/0032-find-debuginfo.sh-Split-directory-traversal-and-debu.patch index 919bc07..d5503a9 100644 --- a/0032-find-debuginfo.sh-Split-directory-traversal-and-debu.patch +++ b/0032-find-debuginfo.sh-Split-directory-traversal-and-debu.patch @@ -1,7 +1,7 @@ From 534fae47e4d05fd27c277c9e04ad238e608289f5 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Sat, 10 Sep 2016 23:13:24 +0200 -Subject: [PATCH 32/49] find-debuginfo.sh: Split directory traversal and +Subject: [PATCH 32/54] find-debuginfo.sh: Split directory traversal and debuginfo extraction This siplifies the handling of hardlinks a bit and allows a later patch diff --git a/0033-find-debuginfo.sh-Use-return-not-continue-to-break-o.patch b/0033-find-debuginfo.sh-Use-return-not-continue-to-break-o.patch index 0069967..d6b20bc 100644 --- a/0033-find-debuginfo.sh-Use-return-not-continue-to-break-o.patch +++ b/0033-find-debuginfo.sh-Use-return-not-continue-to-break-o.patch @@ -1,7 +1,7 @@ From 3e0419ebc11494d9848decfdfb4909cbce9448b7 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Wed, 28 Jun 2017 14:21:32 +0200 -Subject: [PATCH 33/49] find-debuginfo.sh: Use 'return', not 'continue', to +Subject: [PATCH 33/54] find-debuginfo.sh: Use 'return', not 'continue', to break out do_file(). commit 038bfe "Split directory traversal and debuginfo extraction" diff --git a/0034-find-debuginfo.sh-Process-files-in-parallel.patch b/0034-find-debuginfo.sh-Process-files-in-parallel.patch index 9b73611..a7012ac 100644 --- a/0034-find-debuginfo.sh-Process-files-in-parallel.patch +++ b/0034-find-debuginfo.sh-Process-files-in-parallel.patch @@ -1,7 +1,7 @@ From aede94115e077e87504b03bf668ef375290200ad Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Sat, 10 Sep 2016 23:13:25 +0200 -Subject: [PATCH 34/49] find-debuginfo.sh: Process files in parallel +Subject: [PATCH 34/54] find-debuginfo.sh: Process files in parallel Add a -j option, which, when used, will spawn processes to do the debuginfo extraction in parallel. A pipe is used to dispatch the files among diff --git a/0035-Untangle-unique-build-options-in-find-debuginfo.sh.patch b/0035-Untangle-unique-build-options-in-find-debuginfo.sh.patch index a536590..ea2f0a5 100644 --- a/0035-Untangle-unique-build-options-in-find-debuginfo.sh.patch +++ b/0035-Untangle-unique-build-options-in-find-debuginfo.sh.patch @@ -1,7 +1,7 @@ From ac275c650fee13ec0fd204bf2b05fbff01a053cd Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Tue, 28 Mar 2017 14:20:50 +0200 -Subject: [PATCH 35/49] Untangle unique build options in find-debuginfo.sh +Subject: [PATCH 35/54] Untangle unique build options in find-debuginfo.sh Rename --ver-rel option to --build-id-seed, so that it reflects what it does, not how it is used. diff --git a/0036-Support-debugsource-subpackages.patch b/0036-Support-debugsource-subpackages.patch index 7d42e05..0023763 100644 --- a/0036-Support-debugsource-subpackages.patch +++ b/0036-Support-debugsource-subpackages.patch @@ -1,7 +1,7 @@ From 01145b9b68b89d0d4d6d5a77d9af70dba7dbc9a3 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Tue, 28 Mar 2017 14:21:40 +0200 -Subject: [PATCH 36/49] Support debugsource subpackages +Subject: [PATCH 36/54] Support debugsource subpackages This can be enabled by setting the _debugsource_packages macro. diff --git a/0037-Support-debuginfo-subpackages.patch b/0037-Support-debuginfo-subpackages.patch index 9417e7f..7a3e173 100644 --- a/0037-Support-debuginfo-subpackages.patch +++ b/0037-Support-debuginfo-subpackages.patch @@ -1,7 +1,7 @@ From bc5c404e7415108f15a8cd5e8514a74b43a7755a Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Fri, 24 Mar 2017 15:35:23 +0100 -Subject: [PATCH 37/49] Support debuginfo subpackages +Subject: [PATCH 37/54] Support debuginfo subpackages We do this by filtering the debuginfo files generated by find-debuginfo.sh with the files from the (sub)packages. diff --git a/0038-Also-add-directories-to-split-debuginfo-packages.patch b/0038-Also-add-directories-to-split-debuginfo-packages.patch index 1620994..bf93433 100644 --- a/0038-Also-add-directories-to-split-debuginfo-packages.patch +++ b/0038-Also-add-directories-to-split-debuginfo-packages.patch @@ -1,7 +1,7 @@ From 9f826d903dabbc2ce199560e296224c320bb840f Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Wed, 29 Mar 2017 14:55:10 +0200 -Subject: [PATCH 38/49] Also add directories to split debuginfo packages +Subject: [PATCH 38/54] Also add directories to split debuginfo packages This gets rid of the last difference between debuginfo subpackages and normal debuginfo packages. diff --git a/0039-debugedit-skip_dir_prefix-should-check-for-dir-separ.patch b/0039-debugedit-skip_dir_prefix-should-check-for-dir-separ.patch index 1e4af80..3e54772 100644 --- a/0039-debugedit-skip_dir_prefix-should-check-for-dir-separ.patch +++ b/0039-debugedit-skip_dir_prefix-should-check-for-dir-separ.patch @@ -1,7 +1,7 @@ From faaf3bbfc261f49eda996801b50996fb1066092f Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Wed, 28 Jun 2017 20:25:39 +0200 -Subject: [PATCH 39/49] debugedit: skip_dir_prefix should check for dir +Subject: [PATCH 39/54] debugedit: skip_dir_prefix should check for dir separator. To count as a real directory prefix the string matched should either diff --git a/0040-find-debuginfo.sh-Filter-out-all-built-in-like-fake-.patch b/0040-find-debuginfo.sh-Filter-out-all-built-in-like-fake-.patch index 5952a03..6968981 100644 --- a/0040-find-debuginfo.sh-Filter-out-all-built-in-like-fake-.patch +++ b/0040-find-debuginfo.sh-Filter-out-all-built-in-like-fake-.patch @@ -1,7 +1,7 @@ From b4d166652011f0d0e8573feb616283698f6cf848 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Wed, 28 Jun 2017 13:34:55 +0200 -Subject: [PATCH 40/49] find-debuginfo.sh: Filter out all like fake +Subject: [PATCH 40/54] find-debuginfo.sh: Filter out all like fake file names. There is no official way to mark an instruction range as being not diff --git a/0041-find-debuginfo.sh-Don-t-create-dwz-multi-file-if-the.patch b/0041-find-debuginfo.sh-Don-t-create-dwz-multi-file-if-the.patch index 0a36004..3ad303f 100644 --- a/0041-find-debuginfo.sh-Don-t-create-dwz-multi-file-if-the.patch +++ b/0041-find-debuginfo.sh-Don-t-create-dwz-multi-file-if-the.patch @@ -1,7 +1,7 @@ From f22cb2890026544499ee4f1a309a44c71e0b8152 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Mon, 26 Jun 2017 17:38:30 +0200 -Subject: [PATCH 41/49] find-debuginfo.sh: Don't create dwz multi file if there +Subject: [PATCH 41/54] find-debuginfo.sh: Don't create dwz multi file if there is only one .debug. dwz -m multi only works when there are multiple .debug input files. diff --git a/0042-Update-find-debuginfo.sh-options-and-macros-document.patch b/0042-Update-find-debuginfo.sh-options-and-macros-document.patch index 6c0586d..7ef7691 100644 --- a/0042-Update-find-debuginfo.sh-options-and-macros-document.patch +++ b/0042-Update-find-debuginfo.sh-options-and-macros-document.patch @@ -1,7 +1,7 @@ From 201b856c02aeb3c4fc6b3a8b96ce8817278f4fbf Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Mon, 26 Jun 2017 13:35:48 +0200 -Subject: [PATCH 42/49] Update find-debuginfo.sh options and macros +Subject: [PATCH 42/54] Update find-debuginfo.sh options and macros documentation. This adds some missing documentation for rpm macros and find-debuginfo.sh diff --git a/0043-Add-OpenSSL-support-for-digest-and-signatures.patch b/0043-Add-OpenSSL-support-for-digest-and-signatures.patch index a67536f..3de3bce 100644 --- a/0043-Add-OpenSSL-support-for-digest-and-signatures.patch +++ b/0043-Add-OpenSSL-support-for-digest-and-signatures.patch @@ -1,7 +1,7 @@ From 709e675cdf0c8f9b07507aad12400398f354cc90 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 16 Jan 2017 09:19:43 -0500 -Subject: [PATCH 43/49] Add OpenSSL support for digest and signatures +Subject: [PATCH 43/54] Add OpenSSL support for digest and signatures Autotools: add --with-crypto=openssl This enables RPM to locate the appropriate flags for compiling diff --git a/0044-Use-RPMTAG_-NAME-instead-of-RPMTAG_-FLAGS-in-parsePr.patch b/0044-Use-RPMTAG_-NAME-instead-of-RPMTAG_-FLAGS-in-parsePr.patch index 51bcc14..a3c250d 100644 --- a/0044-Use-RPMTAG_-NAME-instead-of-RPMTAG_-FLAGS-in-parsePr.patch +++ b/0044-Use-RPMTAG_-NAME-instead-of-RPMTAG_-FLAGS-in-parsePr.patch @@ -1,7 +1,7 @@ From 287cda21a5594ad41ffbd29eb01022f314637bdf Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Tue, 28 Feb 2017 10:57:56 +0100 -Subject: [PATCH 44/49] Use RPMTAG_*NAME instead of RPMTAG_*FLAGS in +Subject: [PATCH 44/54] Use RPMTAG_*NAME instead of RPMTAG_*FLAGS in parsePreamble.c and parseRCPOT() Using the FLGS tags is awkward and inconsistent with other part of the code diff --git a/0045-Fix-check-for-weak-deps-in-external-dependency-gener.patch b/0045-Fix-check-for-weak-deps-in-external-dependency-gener.patch index 70c443c..e07abdf 100644 --- a/0045-Fix-check-for-weak-deps-in-external-dependency-gener.patch +++ b/0045-Fix-check-for-weak-deps-in-external-dependency-gener.patch @@ -1,7 +1,7 @@ From 4fb394a677c17a33c7e3f3455a1a6c109200b87e Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Tue, 28 Feb 2017 17:42:21 +0100 -Subject: [PATCH 45/49] Fix check for weak deps in external dependency +Subject: [PATCH 45/54] Fix check for weak deps in external dependency generator (cherry picked from commit 43d230884365d90d42184a0000f44bb33e5f1ab8) diff --git a/0046-Fix-check-whether-to-allow-rich-deps-in-a-given-tag.patch b/0046-Fix-check-whether-to-allow-rich-deps-in-a-given-tag.patch index 8033857..713d913 100644 --- a/0046-Fix-check-whether-to-allow-rich-deps-in-a-given-tag.patch +++ b/0046-Fix-check-whether-to-allow-rich-deps-in-a-given-tag.patch @@ -1,7 +1,7 @@ From 9a316cbeb61549b3004692c9dd8437b9fa805e74 Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Thu, 9 Mar 2017 12:12:32 +0100 -Subject: [PATCH 46/49] Fix check whether to allow rich deps in a given tag +Subject: [PATCH 46/54] Fix check whether to allow rich deps in a given tag Broken with 9d5bbd9774d00f50749bb045217eaf91c87b6de0 diff --git a/0047-Re-enable-rich-dependecies-for-build-requires-and-co.patch b/0047-Re-enable-rich-dependecies-for-build-requires-and-co.patch index b087748..b5e56a7 100644 --- a/0047-Re-enable-rich-dependecies-for-build-requires-and-co.patch +++ b/0047-Re-enable-rich-dependecies-for-build-requires-and-co.patch @@ -1,7 +1,7 @@ From 27c263a877dd4bfac12ae716038dfbb0a305625b Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Thu, 9 Mar 2017 14:02:10 +0100 -Subject: [PATCH 47/49] Re-enable rich dependecies for build requires and +Subject: [PATCH 47/54] Re-enable rich dependecies for build requires and conflicts (cherry picked from commit cb3dc0b43bd9a119196a527504d03d57d0785092) diff --git a/0048-add-support-for-rich-dependencies-from-dependency-ge.patch b/0048-add-support-for-rich-dependencies-from-dependency-ge.patch index 02db161..065ee20 100644 --- a/0048-add-support-for-rich-dependencies-from-dependency-ge.patch +++ b/0048-add-support-for-rich-dependencies-from-dependency-ge.patch @@ -1,7 +1,7 @@ From c1ed362facbab3d08b5576950d4c6a68cfae9e75 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 25 Feb 2017 12:28:16 +0100 -Subject: [PATCH 48/49] add support for rich dependencies from dependency +Subject: [PATCH 48/54] add support for rich dependencies from dependency generators Mostly achieved by replacing custom parser with the parseRCPOT(). diff --git a/0049-Pass-proper-file-index-when-recording-generated-depe.patch b/0049-Pass-proper-file-index-when-recording-generated-depe.patch index bb98401..a940dc1 100644 --- a/0049-Pass-proper-file-index-when-recording-generated-depe.patch +++ b/0049-Pass-proper-file-index-when-recording-generated-depe.patch @@ -1,7 +1,7 @@ From d6a1e94f18d2f73e7b03025d891aa7e407cb169a Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Wed, 31 May 2017 10:42:03 +0200 -Subject: [PATCH 49/49] Pass proper file index when recording generated +Subject: [PATCH 49/54] Pass proper file index when recording generated dependencies Resolves regression introduced with 8f509d6 diff --git a/0050-Consolidate-defattr-attr-root-root-generation-to-hel.patch b/0050-Consolidate-defattr-attr-root-root-generation-to-hel.patch index 3f8c576..f0a8bf0 100644 --- a/0050-Consolidate-defattr-attr-root-root-generation-to-hel.patch +++ b/0050-Consolidate-defattr-attr-root-root-generation-to-hel.patch @@ -1,7 +1,7 @@ From c24003b77926967589546681ef893e4e11f6b77f Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Fri, 19 May 2017 11:01:12 +0300 -Subject: [PATCH 50/53] Consolidate %defattr/%attr(-,root,root) generation to +Subject: [PATCH 50/54] Consolidate %defattr/%attr(-,root,root) generation to helper function (cherry picked from commit b71d63ef598cb5bf504265a18166d782fb017569) @@ -10,7 +10,7 @@ Subject: [PATCH 50/53] Consolidate %defattr/%attr(-,root,root) generation to 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/build/files.c b/build/files.c -index f27dcc7..e93efeb 100644 +index f27dcc7c1..e93efebd7 100644 --- a/build/files.c +++ b/build/files.c @@ -193,6 +193,16 @@ static void dupAttrRec(const AttrRec oar, AttrRec nar) @@ -98,5 +98,5 @@ index f27dcc7..e93efeb 100644 path = _free(path); ret = 1; -- -2.9.4 +2.13.2 diff --git a/0051-Extract-package-file-list-processing-in-separate-fun.patch b/0051-Extract-package-file-list-processing-in-separate-fun.patch index a35e5ab..eac3da6 100644 --- a/0051-Extract-package-file-list-processing-in-separate-fun.patch +++ b/0051-Extract-package-file-list-processing-in-separate-fun.patch @@ -1,7 +1,7 @@ From bc5990647ad94fcb4acdb68612e16fe514ee59b7 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 29 Jun 2017 13:26:24 +0200 -Subject: [PATCH 51/53] Extract package file list processing in separate +Subject: [PATCH 51/54] Extract package file list processing in separate functions. Extract two functions resetPackageFilesDefaults() and addPackageFileList() @@ -15,7 +15,7 @@ Signed-off-by: Mark Wielaard 1 file changed, 107 insertions(+), 63 deletions(-) diff --git a/build/files.c b/build/files.c -index e93efeb..8baf85e 100644 +index e93efebd7..8baf85e9d 100644 --- a/build/files.c +++ b/build/files.c @@ -2307,45 +2307,35 @@ static void processSpecialDir(rpmSpec spec, Package pkg, FileList fl, @@ -255,5 +255,5 @@ index e93efeb..8baf85e 100644 specialDirFree(specialDoc); specialDirFree(specialLic); -- -2.9.4 +2.13.2 diff --git a/0052-Use-a-file-list-to-add-build-id-files-to-pkgList.patch b/0052-Use-a-file-list-to-add-build-id-files-to-pkgList.patch index 74b4de3..7332b4f 100644 --- a/0052-Use-a-file-list-to-add-build-id-files-to-pkgList.patch +++ b/0052-Use-a-file-list-to-add-build-id-files-to-pkgList.patch @@ -1,7 +1,7 @@ From 97ad525723d0c9af382acadc823b6a744d5426cf Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 29 Jun 2017 13:26:25 +0200 -Subject: [PATCH 52/53] Use a file list to add build-id files to pkgList. +Subject: [PATCH 52/54] Use a file list to add build-id files to pkgList. Change the generation of build-id files to a file list using ARGV_t. First go through the current package list and generate a files list. @@ -15,7 +15,7 @@ Signed-off-by: Mark Wielaard 1 file changed, 33 insertions(+), 41 deletions(-) diff --git a/build/files.c b/build/files.c -index 8baf85e..e88a5d2 100644 +index 8baf85e9d..e88a5d24d 100644 --- a/build/files.c +++ b/build/files.c @@ -1576,6 +1576,15 @@ exit: @@ -189,5 +189,5 @@ index 8baf85e..e88a5d2 100644 * a (possibly new) debuginfo subpackage */ static void filterDebuginfoPackage(rpmSpec spec, Package pkg, -- -2.9.4 +2.13.2 diff --git a/0053-Change-mkattr-to-always-create-a-defattr-with-explic.patch b/0053-Change-mkattr-to-always-create-a-defattr-with-explic.patch index e435496..8f09ce3 100644 --- a/0053-Change-mkattr-to-always-create-a-defattr-with-explic.patch +++ b/0053-Change-mkattr-to-always-create-a-defattr-with-explic.patch @@ -1,7 +1,7 @@ From 13369a562f5cba34779e238b2d6ae0b683ff3b1e Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Thu, 29 Jun 2017 13:26:26 +0200 -Subject: [PATCH 53/53] Change mkattr to always create a %defattr with +Subject: [PATCH 53/54] Change mkattr to always create a %defattr with explicitly set modes. mkattr used "-" as default mode which would pick up the mode for files @@ -23,7 +23,7 @@ Signed-off-by: Mark Wielaard 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/build/files.c b/build/files.c -index e88a5d2..2927492 100644 +index e88a5d24d..29274926c 100644 --- a/build/files.c +++ b/build/files.c @@ -193,13 +193,12 @@ static void dupAttrRec(const AttrRec oar, AttrRec nar) @@ -81,5 +81,5 @@ index e88a5d2..2927492 100644 free(attr); } -- -2.9.4 +2.13.2 diff --git a/0054-rpmfc-fix-ternary-operator.patch b/0054-rpmfc-fix-ternary-operator.patch new file mode 100644 index 0000000..6d2fc3c --- /dev/null +++ b/0054-rpmfc-fix-ternary-operator.patch @@ -0,0 +1,30 @@ +From e7462b81f69933f531ee6905681a24ac61e11bf6 Mon Sep 17 00:00:00 2001 +From: Florian Festi +Date: Fri, 7 Jul 2017 11:30:42 +0200 +Subject: [PATCH 54/54] rpmfc: fix ternary operator + +Fixes: 9d5bbd9774d00f50749bb045217eaf91c87b6de0 +References: https://bugzilla.redhat.com/show_bug.cgi?id=1468476 +Tested-by: Igor Gnatenko +Signed-off-by: Florian Festi +(cherry picked from commit cbb062963b535186a461dfc9e03558a72ec8004d) +--- + build/rpmfc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/build/rpmfc.c b/build/rpmfc.c +index 72f29ddf5..271bfbea8 100644 +--- a/build/rpmfc.c ++++ b/build/rpmfc.c +@@ -1259,7 +1259,7 @@ static rpmRC rpmfcApplyExternal(rpmfc fc) + } + + /* Parse dependencies into header */ +- rc = parseRCPOT(NULL, fc->pkg, getStringBuf(sb_stdout), dm->ntag ? dm->ntag != -1 : RPMTAG_REQUIRENAME, 0, tagflags, addReqProvPkg, NULL); ++ rc = parseRCPOT(NULL, fc->pkg, getStringBuf(sb_stdout), dm->ntag != -1 ? dm->ntag : RPMTAG_REQUIRENAME, 0, tagflags, addReqProvPkg, NULL); + freeStringBuf(sb_stdout); + + if (rc) { +-- +2.13.2 + diff --git a/rpm.spec b/rpm.spec index 689380c..0a66e61 100644 --- a/rpm.spec +++ b/rpm.spec @@ -33,7 +33,7 @@ Summary: The RPM package management system Name: rpm Version: %{rpmver} -Release: %{?snapver:0.%{snapver}.}29%{?dist} +Release: %{?snapver:0.%{snapver}.}30%{?dist} Group: System Environment/Base Url: http://www.rpm.org/ Source0: http://ftp.rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2 @@ -138,6 +138,10 @@ Patch321: 0051-Extract-package-file-list-processing-in-separate-fun.patch Patch322: 0052-Use-a-file-list-to-add-build-id-files-to-pkgList.patch Patch323: 0053-Change-mkattr-to-always-create-a-defattr-with-explic.patch +# Fix regression from 0044-Use-RPMTAG_-NAME-instead-of-RPMTAG_-FLAGS-in-parsePr.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1468476 +Patch330: 0054-rpmfc-fix-ternary-operator.patch + # These are not yet upstream Patch902: rpm-4.7.1-geode-i686.patch # Probably to be upstreamed in slightly different form @@ -636,6 +640,9 @@ exit 0 %doc doc/librpm/html/* %changelog +* Fri Jul 07 2017 Igor Gnatenko - 4.13.0.1-30 +- Fix brokeness when using %%filter_setup (RHBZ #1468476) + * Tue Jul 04 2017 Mark Wielaard - 4.13.0.1-29 - Track patches using https://pagure.io/rpm-fedora - Use file list to explicitly set mode for build-id dirs/files