ffesti pushed to rpm (f22). "- Fix references to go sources in debuginfo packages (..more)"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 15 08:14:13 UTC 2015
>From 03c3322d9a70ee67a18667aa236aee0fe03cb31a Mon Sep 17 00:00:00 2001
From: Florian Festi <ffesti at redhat.com>
Date: Wed, 15 Apr 2015 10:04:09 +0200
Subject: - Fix references to go sources in debuginfo packages - resolves:
#1184221
Conflicts:
rpm.spec
diff --git a/rpm-4.12.0-golang-debuginfo.patch b/rpm-4.12.0-golang-debuginfo.patch
new file mode 100644
index 0000000..feddd4d
--- /dev/null
+++ b/rpm-4.12.0-golang-debuginfo.patch
@@ -0,0 +1,36 @@
+From 363c015da5cbf315df267dc53580290984039804 Mon Sep 17 00:00:00 2001
+From: Jan Kratochvil <jan.kratochvil at redhat.com>
+Date: Wed, 15 Apr 2015 09:51:08 +0200
+Subject: [PATCH] Make sure references to go sources in debuginfo packages go
+ to the installed path and not the source file in the build environment.
+
+ - Resolves: rhbz#1184221
+---
+ tools/debugedit.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/debugedit.c b/tools/debugedit.c
+index 0f85885..cf89312 100644
+--- a/tools/debugedit.c
++++ b/tools/debugedit.c
+@@ -480,7 +480,7 @@ edit_dwarf2_line (DSO *dso, uint32_t off, char *comp_dir, int phase)
+ unsigned char *endcu, *endprol;
+ unsigned char opcode_base;
+ uint32_t value, dirt_cnt;
+- size_t comp_dir_len = strlen (comp_dir);
++ size_t comp_dir_len = !comp_dir ? 0 : strlen (comp_dir);
+ size_t abs_file_cnt = 0, abs_dir_cnt = 0;
+
+ if (phase != 0)
+@@ -950,7 +950,7 @@ edit_attributes (DSO *dso, unsigned char *ptr, struct abbrev_tag *t, int phase)
+ }
+ }
+
+- if (found_list_offs && comp_dir)
++ if (found_list_offs)
+ edit_dwarf2_line (dso, list_offs, comp_dir, phase);
+
+ free (comp_dir);
+--
+2.1.0
+
diff --git a/rpm.spec b/rpm.spec
index 9a949d3..d4b6d59 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -27,7 +27,7 @@
Summary: The RPM package management system
Name: rpm
Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}8%{?dist}
+Release: %{?snapver:0.%{snapver}.}9%{?dist}
Group: System Environment/Base
Url: http://www.rpm.org/
Source0: http://rpm.org/releases/rpm-4.12.x/%{name}-%{srcver}.tar.bz2
@@ -59,6 +59,8 @@ Patch102: rpm-4.12.0-archive-endian.patch
# find-debuginfo.sh fails on ELF with more than 256 notes
# http://www.rpm.org/ticket/887
Patch103: 0001-Fix-find-debuginfo.sh-for-ELF-with-file-warnings.patch
+# Fix golang debuginfo packages
+Patch104: rpm-4.12.0-golang-debuginfo.patch
# These are not yet upstream
Patch302: rpm-4.7.1-geode-i686.patch
@@ -543,6 +545,9 @@ exit 0
%doc doc/librpm/html/*
%changelog
+* Wed Apr 15 2015 Florian Festi <ffesti at rpm.org> - 4.12.0.1-9
+- Fix references to sources in golang debuginfo packages (#1184221)
+
* Mon Mar 16 2015 Than Ngo <than at redhat.com> - 4.12.0.1-8
- bump release and rebuild so that koji-shadow can rebuild it
against new gcc on secondary arch
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/rpm.git/commit/?h=f22&id=03c3322d9a70ee67a18667aa236aee0fe03cb31a
More information about the scm-commits
mailing list