rpms
/
rpm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merged update from upstream sources 

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/rpm.git#d5b8c7b4cb601c430a7604b2c4b2da6309f4e522
This commit is contained in:
DistroBaker 2021-01-22 11:06:00 +00:00
parent 6ff1afd362
commit 7a85b5f8a4
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
0006-debugedit-Handle-DWARF-5-debug_line-and-debug_line_s.patch
View File

@ -484,7 +484,7 @@ index be5fee85b..d6a0058e9 100644
- dir = (char *) debug_sections[DEBUG_STR].data + idx;
+ debug_section *sec = &debug_sections[line_strp
+ ? DEBUG_LINE_STR : DEBUG_STR];
+ if (sec->data == NULL || idx >= debug_sections[DEBUG_STR].size)
+ if (sec->data == NULL || idx >= sec->size)
+ error (1, 0, "%s: Bad string pointer index %zd for comp_dir (%s)",
+ dso->filename, idx, sec->name);
+ dir = (char *) sec->data + idx;

6
rpm.spec
View File

@ -32,7 +32,7 @@
%global rpmver 4.16.1.2
#global snapver rc1
%global rel 3
%global rel 4
%global sover 9
%global srcver %{rpmver}%{?snapver:-%{snapver}}
@ -75,6 +75,7 @@ Patch906: rpm-4.7.1-geode-i686.patch
Patch907: rpm-4.15.x-ldflags.patch
# Not yet (all) upstream, debugedit DWARF5
# https://code.wildebeest.org/git/user/mjw/rpm/log/?h=gcc-dwarf5-4.16.1.2
Patch911: 0001-NFC-debugedit-Protect-macro-arguments-by-parentheses.patch
Patch912: 0002-NFC-debugedit-Move-code-from-edit_dwarf2-to-edit_inf.patch
Patch913: 0003-debugedit-Fix-missing-relocation-of-.debug_types-sec.patch
@ -573,6 +574,9 @@ fi
%doc doc/librpm/html/*
%changelog
* Fri Jan 22 2021 Mark Wielaard <mjw@fedoraproject.org> - 4.16.1.2-4
- Fix edit_attributes_str_comp_dir in Patch916 (#1919107)
* Tue Jan 19 2021 Jeff Law <law@redhat.com> - 4.16.1.2-3
- Fix typo in test for F33 or newer