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

[notifications at fedoraproject.org]

>From f33b262d88eb75ec9536c5403427cba3417d8871 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 75adaa2..f3167bd 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -21,7 +21,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}2%{?dist}
+Release: %{?snapver:0.%{snapver}.}3%{?dist}
 Group: System Environment/Base
 Url: http://www.rpm.org/
 Source0: http://rpm.org/releases/rpm-4.11.x/%{name}-%{srcver}.tar.bz2
@@ -53,6 +53,8 @@ Patch10: rpm-4.11.2-double-separator-warning.patch
 # Filter soname dependencies by name (these are upstream but not in 4.11.x)
 Patch100: rpm-4.11.x-filter-soname-deps.patch
 Patch102: rpm-4.11.x-do-not-filter-ld64.patch
+# Fix golang debuginfo packages
+Patch103: rpm-4.12.0-golang-debuginfo.patch
 
 # These are not yet upstream
 Patch301: rpm-4.6.0-niagara.patch
@@ -519,6 +521,9 @@ exit 0
 %doc COPYING doc/librpm/html/*
 
 %changelog
+* Wed Apr 15 2015 Florian Festi <ffesti at rpm.org> - 4.12.0.1-3
+- Fix references to sources in golang debuginfo packages (#1184221)
+
 * Fri Dec 12 2014 Lubos Kardos <lkardos at redhat.com> - 4.11.3-2
 - Add check against malicious CPIO file name size (#1168715)
 - Fixes CVE-2014-8118
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/rpm.git/commit/?h=f20&id=f33b262d88eb75ec9536c5403427cba3417d8871