Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

Please unblock packages eztrace and eztrace-contrib

eztrace has two ways of tracing applications: using LD_PRELOAD
(/usr/bin/eztrace.preload) or using ptrace (/usr/bin/eztrace).
Currently the ptrace way doesn't record anything, as reported as
Bug#775286, because the plugin path was hardcoded to @prefix@/lib
instead of @libdir@.  Fixing this is however not enough: the eztrace
engine looks quite closely at the modules being loaded, and that
currently does not work with stripped objects.  Fixing this will
probably be relatively invasive, so in the attached patches I preferred
to just not strip these modules.

unblock eztrace/1.0.6-4
unblock eztrace-contrib/1.0.5-3

-- System Information:
Debian Release: 8.0
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'buildd-unstable'), (500, 'unstable'), 
(500, 'stable'), (500, 'oldstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.18.0 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: systemd (via /run/systemd/system)

-- 
Samuel
<s> T'as pas de portable ?
<m> J'ai un nokia, dans le bassin d'arcachon
diff -Nru eztrace-1.0.6/debian/changelog eztrace-1.0.6/debian/changelog
--- eztrace-1.0.6/debian/changelog      2014-12-02 22:56:58.000000000 +0100
+++ eztrace-1.0.6/debian/changelog      2015-01-14 14:52:51.000000000 +0100
@@ -1,3 +1,10 @@
+eztrace (1.0.6-4) unstable; urgency=medium
+
+  * patches/libdir: Fix plugin path search for the pptrace case
+    (closes: Bug#775286).
+
+ -- Samuel Thibault <sthiba...@debian.org>  Wed, 14 Jan 2015 14:52:50 +0100
+
 eztrace (1.0.6-3) unstable; urgency=medium
 
   * patches/git-ebe444a: Cherry-pick from upstream to fix uninitialized value.
diff -Nru eztrace-1.0.6/debian/patches/libdir 
eztrace-1.0.6/debian/patches/libdir
--- eztrace-1.0.6/debian/patches/libdir 1970-01-01 01:00:00.000000000 +0100
+++ eztrace-1.0.6/debian/patches/libdir 2015-01-14 14:22:00.000000000 +0100
@@ -0,0 +1,25 @@
+--- a/src/core/eztrace.c.in
++++ b/src/core/eztrace.c.in
+@@ -141,11 +141,11 @@ int main(int argc, char **argv) {
+ 
+   // make sure eztrace libs are available
+   char *ld_library_path = get_env_str("", "@LD_LIBRARY_PATH_NAME@",
+-                                      (test == 0) ? ":@prefix@/lib" : "");
++                                      (test == 0) ? ":@libdir@" : "");
+   // other env variables
+   char *ezt_trace = get_env_str("", "EZTRACE_TRACE", "");
+   char *ezt_library_path = get_env_str("", "EZTRACE_LIBRARY_PATH",
+-                                       (test == 0) ? ":@prefix@/lib" : "");
++                                       (test == 0) ? ":@libdir@" : "");
+ 
+   // prog_name
+   char *prog_name = argv[nb_opts + 1];
+@@ -228,7 +228,7 @@ int main(int argc, char **argv) {
+     // we have to get EZTRACE_LIBRARY_PATH again because we strtok-ed it
+     free(ezt_library_path);
+     ezt_library_path = get_env_str("", "EZTRACE_LIBRARY_PATH",
+-                                   (test == 0) ? ":@prefix@/lib" : "");
++                                   (test == 0) ? ":@libdir@" : "");
+ 
+     char *dir = NULL;
+     dir = strtok(ezt_library_path, ":");
diff -Nru eztrace-1.0.6/debian/patches/series 
eztrace-1.0.6/debian/patches/series
--- eztrace-1.0.6/debian/patches/series 2014-12-02 22:57:08.000000000 +0100
+++ eztrace-1.0.6/debian/patches/series 2015-01-14 14:51:38.000000000 +0100
@@ -6,3 +6,4 @@
 git-0cb79edc3411c0e04e411d7c8f60a6596632a4ea
 no-armv7.patch
 git-ebe444a
+libdir
diff -Nru eztrace-1.0.6/debian/rules eztrace-1.0.6/debian/rules
--- eztrace-1.0.6/debian/rules  2014-10-23 15:38:18.000000000 +0200
+++ eztrace-1.0.6/debian/rules  2015-01-14 14:52:02.000000000 +0100
@@ -47,3 +47,6 @@
 ifeq ($(OPENMPI),yes)
        -dh_auto_test -Bbuild-openmpi -- -C src/modules/mpi -k
 endif
+
+override_dh_strip:
+       dh_strip -Xlibeztrace-autostart-
diff -Nru eztrace-contrib-1.0.5/debian/changelog 
eztrace-contrib-1.0.5/debian/changelog
--- eztrace-contrib-1.0.5/debian/changelog      2015-01-08 13:15:06.000000000 
+0100
+++ eztrace-contrib-1.0.5/debian/changelog      2015-01-14 17:49:49.000000000 
+0100
@@ -1,3 +1,10 @@
+eztrace-contrib (1.0.5-3) unstable; urgency=medium
+
+  * rules: Do not strip modules for pptrace auto-load, otherwise they won't be
+    loadable.
+
+ -- Samuel Thibault <sthiba...@debian.org>  Wed, 14 Jan 2015 14:52:50 +0100
+
 eztrace-contrib (1.0.5-2) unstable; urgency=medium
 
   * patches/libtool-path: Fix path to libtool (Closes: Bug#774609).
diff -Nru eztrace-contrib-1.0.5/debian/rules eztrace-contrib-1.0.5/debian/rules
--- eztrace-contrib-1.0.5/debian/rules  2015-01-08 13:08:09.000000000 +0100
+++ eztrace-contrib-1.0.5/debian/rules  2015-01-14 17:50:03.000000000 +0100
@@ -45,3 +45,6 @@
 
 override_dh_auto_test:
        -dh_auto_test -Bbuild-mpich -- -C src/modules/cuda -k
+
+override_dh_strip:
+       dh_strip -Xlibeztrace-autostart-

Reply via email to