onbld (2.10+7) unstable; urgency=medium

  * Use native version scheme
  * Fixed dlopening libz (added libctf-dlopen-libz.patch)
  * Fixed building against multiarch zlib (added missing-zconf.h.patch)
  * Fixed some compiler warnings (added cvt-pointers.patch)
  * Strip binaries

6 files changed, 122 insertions, 0 deletions

diff --git a/onbld/debian/changelog b/onbld/debian/changelog
index 7532de0..1490027 100644
--- a/onbld/debian/changelog
+++ b/onbld/debian/changelog
@@ -1,3 +1,19 @@
+onbld (2.10+7) unstable; urgency=medium
+
+  * Updated libctf-dlopen-libz.patch: don't try to access() libz.so.1 
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sun, 09 Feb 2014 00:03:00 +0400
+
+onbld (2.10+6) unstable; urgency=medium
+
+  * Use native version scheme
+  * Fixed dlopening libz (added libctf-dlopen-libz.patch)
+  * Fixed building against multiarch zlib (added missing-zconf.h.patch)
+  * Fixed some compiler warnings (added cvt-pointers.patch)
+  * Strip binaries
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sat, 08 Feb 2014 23:52:39 +0400
+
 onbld (2.10-5) unstable; urgency=low
 
   * Added for UTS build:
diff --git a/onbld/debian/patches/cvt-pointers.patch b/onbld/debian/patches/cvt-pointers.patch
new file mode 100644
index 0000000..92c2ff9
--- /dev/null
+++ b/onbld/debian/patches/cvt-pointers.patch
@@ -0,0 +1,57 @@
+Index: onbld/usr/src/tools/ctf/cvt/ctf.c
+===================================================================
+--- onbld.orig/usr/src/tools/ctf/cvt/ctf.c	2012-10-08 04:25:50.000000000 +0400
++++ onbld/usr/src/tools/ctf/cvt/ctf.c	2014-02-08 23:43:20.097687345 +0400
+@@ -1216,7 +1216,7 @@
+ 	    (rc = inflate(&zstr, Z_NO_FLUSH)) != Z_STREAM_END ||
+ 	    (rc = inflateEnd(&zstr)) != Z_OK) {
+ 		warning("CTF decompress zlib error %s\n", zError(rc));
+-		return (NULL);
++		return (0);
+ 	}
+ 
+ 	debug(3, "reflated %lu bytes to %lu, pointer at %d\n",
+Index: onbld/usr/src/tools/ctf/cvt/output.c
+===================================================================
+--- onbld.orig/usr/src/tools/ctf/cvt/output.c	2014-02-08 23:35:26.736776087 +0400
++++ onbld/usr/src/tools/ctf/cvt/output.c	2014-02-08 23:44:30.977449442 +0400
+@@ -466,7 +466,7 @@
+ 	int pad;
+ 	int i;
+ 
+-	if (gelf_newehdr(dst, gelf_getclass(src)) == NULL)
++	if (gelf_newehdr(dst, gelf_getclass(src)) == 0)
+ 		elfterminate(dstname, "Cannot copy ehdr to temp file");
+ 	gelf_getehdr(src, &sehdr);
+ 	memcpy(&dehdr, &sehdr, sizeof (GElf_Ehdr));
+@@ -491,7 +491,7 @@
+ #endif
+ 	if (sehdr.e_phnum != 0) {
+ 		(void) elf_flagelf(dst, ELF_C_SET, ELF_F_LAYOUT | ELF_F_LAYOUT_OVERLAP);
+-		if (gelf_newphdr(dst, sehdr.e_phnum) == NULL)
++		if (gelf_newphdr(dst, sehdr.e_phnum) == 0)
+ 			elfterminate(dstname, "Cannot make phdrs in temp file");
+ 
+ 		for (i = 0; i < sehdr.e_phnum; i++) {
+@@ -625,7 +625,7 @@
+ 			}
+ 		}
+ 
+-		if (gelf_update_shdr(dscn, &shdr) == NULL)
++		if (gelf_update_shdr(dscn, &shdr) == 0)
+ 			elfterminate(dstname, "Cannot update sect %s", sname);
+ 
+ 		new_offset = (off_t)shdr.sh_offset;
+Index: onbld/usr/src/tools/ctf/cvt/dwarf.c
+===================================================================
+--- onbld.orig/usr/src/tools/ctf/cvt/dwarf.c	2014-02-08 23:35:26.522363221 +0400
++++ onbld/usr/src/tools/ctf/cvt/dwarf.c	2014-02-08 23:45:31.065519143 +0400
+@@ -1714,7 +1714,7 @@
+ 	{ DW_TAG_variable,		DW_F_NOTDP,	die_variable_create },
+ 	{ DW_TAG_volatile_type,		0,		die_volatile_create },
+ 	{ DW_TAG_restrict_type,		0,		die_restrict_create },
+-	{ 0, NULL }
++	{ 0, 0, NULL }
+ };
+ 
+ static const die_creator_t *
diff --git a/onbld/debian/patches/libctf-dlopen-libz.patch b/onbld/debian/patches/libctf-dlopen-libz.patch
new file mode 100644
index 0000000..097067b
--- /dev/null
+++ b/onbld/debian/patches/libctf-dlopen-libz.patch
@@ -0,0 +1,27 @@
+Index: onbld/usr/src/lib/libctf/common/ctf_lib.c
+===================================================================
+--- onbld.orig/usr/src/lib/libctf/common/ctf_lib.c	2012-10-08 04:25:38.000000000 +0400
++++ onbld/usr/src/lib/libctf/common/ctf_lib.c	2014-02-09 00:02:11.818740478 +0400
+@@ -34,11 +34,7 @@
+ #include <dlfcn.h>
+ #include <gelf.h>
+ 
+-#ifdef _LP64
+-static const char *_libctf_zlib = "/usr/lib/64/libz.so.1";
+-#else
+-static const char *_libctf_zlib = "/usr/lib/libz.so.1";
+-#endif
++static const char *_libctf_zlib = "libz.so.1";
+ 
+ static struct {
+ 	int (*z_uncompress)(uchar_t *, ulong_t *, const uchar_t *, ulong_t);
+@@ -77,9 +73,6 @@
+ 	if (zlib.z_dlp != NULL)
+ 		return (zlib.z_dlp); /* library is already loaded */
+ 
+-	if (access(_libctf_zlib, R_OK) == -1)
+-		return (ctf_set_open_errno(errp, ECTF_ZMISSING));
+-
+ 	if ((zlib.z_dlp = dlopen(_libctf_zlib, RTLD_LAZY | RTLD_LOCAL)) == NULL)
+ 		return (ctf_set_open_errno(errp, ECTF_ZINIT));
+ 
diff --git a/onbld/debian/patches/missing-zconf.h.patch b/onbld/debian/patches/missing-zconf.h.patch
new file mode 100644
index 0000000..4da9357
--- /dev/null
+++ b/onbld/debian/patches/missing-zconf.h.patch
@@ -0,0 +1,18 @@
+Description: zconf.h is in multiarch directory
+Index: onbld/usr/src/tools/ctf/Makefile.ctf
+===================================================================
+--- onbld.orig/usr/src/tools/ctf/Makefile.ctf	2014-02-08 23:35:27.579701546 +0400
++++ onbld/usr/src/tools/ctf/Makefile.ctf	2014-02-08 23:40:13.490580030 +0400
+@@ -36,11 +36,9 @@
+ # 
+ 
+ HDRDIRS= \
+-	-_gcc=-nostdinc \
+ 	-I../../common \
+ 	-I$(SRC) \
+-	-I$(ROOT)/usr/include \
+-	-I/usr/include \
++	-I$(ROOT)/usr/include
+ 
+ CPPFLAGS += $(HDRDIRS)
+ CFLAGS += $(CCVERBOSE)
diff --git a/onbld/debian/patches/series b/onbld/debian/patches/series
index d937339..1f50789 100644
--- a/onbld/debian/patches/series
+++ b/onbld/debian/patches/series
@@ -20,3 +20,6 @@ no-ask-as.patch
 no-exception_lists.patch
 libctf-headers.patch
 ctfstabs-lib.patch
+libctf-dlopen-libz.patch
+missing-zconf.h.patch
+cvt-pointers.patch
diff --git a/onbld/debian/rules b/onbld/debian/rules
index 755bc30..4f20c80 100755
--- a/onbld/debian/rules
+++ b/onbld/debian/rules
@@ -90,6 +90,7 @@ binary-stamp: build-stamp
 	dh_installdocs
 	dh_installexamples
 	dh_installchangelogs
+	dh_strip
 	dh_link
 	dh_compress
 	dh_fixperms