dtrace (4.3+1) unstable; urgency=medium

  * Added debian/patches/libdtrace-i386-regs.patch
  * Added debian/patches/libdtrace-std-cpp.patch
  * Added debian/patches/libdtrace-time.patch

5 files changed, 59 insertions, 0 deletions

diff --git a/dtrace/debian/changelog b/dtrace/debian/changelog
index c456205..dfad39a 100644
--- a/dtrace/debian/changelog
+++ b/dtrace/debian/changelog
@@ -1,3 +1,11 @@
+dtrace (4.3+1) unstable; urgency=medium
+
+  * Added debian/patches/libdtrace-i386-regs.patch
+  * Added debian/patches/libdtrace-std-cpp.patch
+  * Added debian/patches/libdtrace-time.patch
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Mon, 30 Mar 2015 23:52:13 +0300
+
 dtrace (4.3) unstable; urgency=medium
 
   * New upstream snapshot
diff --git a/dtrace/debian/patches/libdtrace-i386-regs.patch b/dtrace/debian/patches/libdtrace-i386-regs.patch
new file mode 100644
index 0000000..18e61a1
--- /dev/null
+++ b/dtrace/debian/patches/libdtrace-i386-regs.patch
@@ -0,0 +1,13 @@
+Description: some macros were hidden by _I386_REGS
+Index: dtrace/usr/src/lib/libdtrace/i386/Makefile
+===================================================================
+--- dtrace.orig/usr/src/lib/libdtrace/i386/Makefile
++++ dtrace/usr/src/lib/libdtrace/i386/Makefile
+@@ -34,6 +34,7 @@ include ../Makefile.com
+ 
+ SRCS += $(SRC)/common/dis/i386/dis_tables.c
+ CPPFLAGS += -I$(SRC)/common/dis/i386
++CPPFLAGS += -D_I386_REGS
+ 
+ LINTFLAGS += -erroff=E_BAD_PTR_CAST_ALIGN
+ 
diff --git a/dtrace/debian/patches/libdtrace-std-cpp.patch b/dtrace/debian/patches/libdtrace-std-cpp.patch
new file mode 100644
index 0000000..1ba59a0
--- /dev/null
+++ b/dtrace/debian/patches/libdtrace-std-cpp.patch
@@ -0,0 +1,14 @@
+Description: __STDC__ = 1 by default (man page says so)
+Index: dtrace/usr/src/lib/libdtrace/common/dt_open.c
+===================================================================
+--- dtrace.orig/usr/src/lib/libdtrace/common/dt_open.c
++++ dtrace/usr/src/lib/libdtrace/common/dt_open.c
+@@ -941,7 +941,7 @@ alloc:
+ 	dtp->dt_linkmode = DT_LINK_KERNEL;
+ 	dtp->dt_linktype = DT_LTYP_ELF;
+ 	dtp->dt_xlatemode = DT_XL_STATIC;
+-	dtp->dt_stdcmode = DT_STDC_XA;
++	dtp->dt_stdcmode = DT_STDC_XC;
+ 	dtp->dt_encoding = DT_ENCODING_UNSET;
+ 	dtp->dt_version = version;
+ 	dtp->dt_fd = dtfd;
diff --git a/dtrace/debian/patches/libdtrace-time.patch b/dtrace/debian/patches/libdtrace-time.patch
new file mode 100644
index 0000000..d5d63e5
--- /dev/null
+++ b/dtrace/debian/patches/libdtrace-time.patch
@@ -0,0 +1,21 @@
+Index: dtrace/usr/src/lib/libdtrace/common/dt_printf.c
+===================================================================
+--- dtrace.orig/usr/src/lib/libdtrace/common/dt_printf.c
++++ dtrace/usr/src/lib/libdtrace/common/dt_printf.c
+@@ -31,6 +31,7 @@
+ #include <alloca.h>
+ #include <assert.h>
+ #include <ctype.h>
++#include <time.h>
+ #include <errno.h>
+ #include <limits.h>
+ #include <sys/socket.h>
+@@ -458,7 +459,7 @@ pfprint_time(dtrace_hdl_t *dtp, FILE *fp
+ 	 * Below, we turn this into the canonical adb/mdb /[yY] format,
+ 	 * "1973 Dec  3 17:20:00".
+ 	 */
+-	(void) ctime_r(&sec, src, sizeof (src));
++	(void) ctime_r(&sec, src);
+ 
+ 	/*
+ 	 * Place the 4-digit year at the head of the string...
diff --git a/dtrace/debian/patches/series b/dtrace/debian/patches/series
index ceda92d..8e48445 100644
--- a/dtrace/debian/patches/series
+++ b/dtrace/debian/patches/series
@@ -1,3 +1,6 @@
 libdtrace-use-system-headers.patch
 libdtrace-pointers.patch
 libdtrace-tools.patch
+libdtrace-time.patch
+libdtrace-std-cpp.patch
+libdtrace-i386-regs.patch