ffesti pushed to rpm (master). "- Fix references to go sources in debuginfo packages (..more)"

[notifications at fedoraproject.org]

>From 7307a5ee395bab56bd19c9fc30bd953f95a15859 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


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 d7de9f9..c5b76db 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}.}13%{?dist}
+Release: %{?snapver:0.%{snapver}.}14%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.12.x/%{name}-%{srcver}.tar.bz2
@@ -63,6 +63,8 @@ Patch103: 0001-Fix-find-debuginfo.sh-for-ELF-with-file-warnings.patch
 Patch104: rpm-4.12.0-exclude-doc.patch
 # Pass _find_debuginfo_opts -g to eu-strip for executables (#1186563)
 Patch105: rpm-4.12.0-eu-strip-g-option.patch
+# Fix golang debuginfo packages
+Patch106: rpm-4.12.0-golang-debuginfo.patch
 
 # These are not yet upstream
 Patch302: rpm-4.7.1-geode-i686.patch
@@ -547,6 +549,9 @@ exit 0
 %doc doc/librpm/html/*
 
 %changelog
+* Wed Apr 15 2015 Florian Festi <ffesti at rpm.org> - 4.12.0.1-14
+- Fix references to sources in golang debuginfo packages (#1184221)
+
 * Tue Mar 31 2015 Lubos Kardos <lkardos at redhat.com> 4.12.0-13
 - Fix wrong use of variable strip_g in find-debuginfo.sh (#1207434)
 
@@ -562,6 +567,7 @@ exit 0
 
 * Fri Mar 20 2015 Florian Festi <ffesti at rpm.org> - 4.12.0.1-9
 - Fix spec to allow building without plugins (#1182385)
+
 * 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=master&id=7307a5ee395bab56bd19c9fc30bd953f95a15859