onbld (5.10.18.git.2a44663-1)

26 files changed, 227 insertions, 340 deletions

diff --git a/onbld/debian/changelog b/onbld/debian/changelog
index 9d0dd71..3a09f5e 100644
--- a/onbld/debian/changelog
+++ b/onbld/debian/changelog
@@ -1,3 +1,12 @@
+onbld (5.10.18.git.2a44663-1) unstable; urgency=medium
+
+  * New upstream release
+  * Use 3.0 (quilt) format with new dh_illumos_gate
+  * Updated patches
+  * Dropped codereview & webreview
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sun, 04 Dec 2016 14:40:44 +0300
+
 onbld (4.3) unstable; urgency=medium
 
   * New upstream snapshot
diff --git a/onbld/debian/codereview.install b/onbld/debian/codereview.install
deleted file mode 100644
index ad45894..0000000
--- a/onbld/debian/codereview.install
+++ /dev/null
@@ -1 +0,0 @@
-/opt/onbld/bin/*/codereview /usr/bin/
diff --git a/onbld/debian/codereview.manpages b/onbld/debian/codereview.manpages
deleted file mode 100644
index 25c304c..0000000
--- a/onbld/debian/codereview.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/tmp/opt/onbld/man/man1/codereview.1
diff --git a/onbld/debian/control b/onbld/debian/control
index cb4ead6..358391e 100644
--- a/onbld/debian/control
+++ b/onbld/debian/control
@@ -7,12 +7,10 @@ Build-Depends:
  dh-illumos,
  flex,
  gcc-multilib,
- illumos-source-4.3,
  libdwarf-dev (>= 20120410-2+dyson4),
  libelfg0-dev,
  libncurses5-dev,
  libz-dev,
- python-all,
  quilt,
  symlinks,
 Standards-Version: 3.9.3
@@ -34,34 +32,6 @@ Description: generates C code to implement NDR protocol
  NDR routines in proto_ndr.c. Applications must define the service definition
  and server-side stub table for use with the RPC protocol.
 
-
-Package: codereview
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Section: devel
-Priority: optional
-Description: diff list generator
- The codereview command expects two ASCII text files as input and produces
- Postscript describing the differences between the files. The first file is
- assumed to be the older version, and the second file is assumed to be the
- newer version. If either oldfile or newfile is -, the corresponding file is
- taken from the standard input. The output goes to standard output and lists
- all lines from both files, with lines changed from the first to the second
- being highlighted in gray. Lines deleted from the first file are listed in
- italic, while lines added to the second file are listed in bold.
-
-Package: webrev
-Architecture: all
-Depends: ksh93, ${misc:Depends}, nawk | gawk, perl
-Recommends: rsync, ssh-client, ghostscript, git
-Suggests: codereview
-Section: devel
-Priority: optional
-Description: create and publish code reviews
- webrev is a tool which allows illumos developer to generate websites with
- all the changes to the code, so other people can review it and apply patch
- which is also a part of the generated webrev.
-
 Package: onbld
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ctfutils, ndrgen
@@ -131,3 +101,4 @@ Description: Compact ANSI-C Type Format debugger library (32-bit development)
  .
  The libctf library provides functions that a debugger can
  use to operate on data in the Compact ANSI-C Type Format (CTF)
+
diff --git a/onbld/debian/ndrgen.manpages b/onbld/debian/ndrgen.manpages
index 0b511c2..8822981 100644
--- a/onbld/debian/ndrgen.manpages
+++ b/onbld/debian/ndrgen.manpages
@@ -1 +1 @@
-debian/tmp/opt/onbld/man/man1/ndrgen.1
+usr/src/tools/ndrgen/ndrgen.1onbld
diff --git a/onbld/debian/onbld.install b/onbld/debian/onbld.install
index 419c2f9..95c73fa 100644
--- a/onbld/debian/onbld.install
+++ b/onbld/debian/onbld.install
@@ -1,5 +1,5 @@
 /opt/onbld/bin/*/cw
-/opt/onbld/man/man1/cw.1
+/opt/onbld/man/man1onbld/cw.1onbld
 /opt/onbld/bin/*/aw
 /opt/onbld/bin/genoffsets
 /opt/onbld/bin/*/elfextract
diff --git a/onbld/debian/patches/aw-amd64.patch b/onbld/debian/patches/aw-amd64.patch
index c2e1272..04fae00 100644
--- a/onbld/debian/patches/aw-amd64.patch
+++ b/onbld/debian/patches/aw-amd64.patch
@@ -1,8 +1,8 @@
-Index: b/usr/src/tools/aw/aw.c
+Index: onbld/usr/src/tools/aw/aw.c
 ===================================================================
---- a/usr/src/tools/aw/aw.c	2014-03-02 01:31:24.749563693 +0400
-+++ b/usr/src/tools/aw/aw.c	2014-03-02 01:32:28.934272175 +0400
-@@ -729,7 +729,7 @@
+--- onbld.orig/usr/src/tools/aw/aw.c
++++ onbld/usr/src/tools/aw/aw.c
+@@ -730,7 +730,7 @@ main(int argc, char *argv[])
  		}
  	}
  
@@ -11,7 +11,7 @@ Index: b/usr/src/tools/aw/aw.c
  	if (as64)
  		newae(as, "--64");
  	else
-@@ -752,7 +752,7 @@
+@@ -753,7 +753,7 @@ main(int argc, char *argv[])
  			newae(cpp, "-D__sparcv9");
  		else
  			newae(cpp, "-D__sparcv8");
diff --git a/onbld/debian/patches/ctf-no-clobbered.patch b/onbld/debian/patches/ctf-no-clobbered.patch
new file mode 100644
index 0000000..e25eb93
--- /dev/null
+++ b/onbld/debian/patches/ctf-no-clobbered.patch
@@ -0,0 +1,15 @@
+Description:
+
+../st_parse.c:403:32: error: argument 'cp' might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered]
+ parse_stab(stab_t *stab, char *cp, iidesc_t **iidescp)
+
+
+Index: onbld/usr/src/tools/ctf/Makefile.ctf
+===================================================================
+--- onbld.orig/usr/src/tools/ctf/Makefile.ctf
++++ onbld/usr/src/tools/ctf/Makefile.ctf
+@@ -43,3 +43,4 @@ HDRDIRS= \
+ CPPFLAGS += $(HDRDIRS)
+ CFLAGS += $(CCVERBOSE)
+ CERRWARN += -_gcc=-Wno-parentheses
++CERRWARN += -_gcc=-Wno-clobbered
diff --git a/onbld/debian/patches/ctfmerge-overlapped-sections.patch b/onbld/debian/patches/ctfmerge-overlapped-sections.patch
index bace0a1..fc5c88e 100644
--- a/onbld/debian/patches/ctfmerge-overlapped-sections.patch
+++ b/onbld/debian/patches/ctfmerge-overlapped-sections.patch
@@ -1,8 +1,8 @@
-Index: b/usr/src/tools/ctf/cvt/output.c
+Index: onbld/usr/src/tools/ctf/cvt/output.c
 ===================================================================
---- a/usr/src/tools/ctf/cvt/output.c	2014-03-02 01:31:21.965026251 +0400
-+++ b/usr/src/tools/ctf/cvt/output.c	2014-03-02 01:32:34.747700061 +0400
-@@ -480,8 +480,17 @@
+--- onbld.orig/usr/src/tools/ctf/cvt/output.c
++++ onbld/usr/src/tools/ctf/cvt/output.c
+@@ -477,8 +477,17 @@ write_file(Elf *src, const char *srcname
  	 * program headers.  As such, we can just blindly copy the program
  	 * headers from the existing file to the new file.
  	 */
@@ -18,6 +18,6 @@ Index: b/usr/src/tools/ctf/cvt/output.c
  	if (sehdr.e_phnum != 0) {
 -		(void) elf_flagelf(dst, ELF_C_SET, ELF_F_LAYOUT);
 +		(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");
  
diff --git a/onbld/debian/patches/cvt-pointers.patch b/onbld/debian/patches/cvt-pointers.patch
deleted file mode 100644
index 8b8237f..0000000
--- a/onbld/debian/patches/cvt-pointers.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Index: b/usr/src/tools/ctf/cvt/ctf.c
-===================================================================
---- a/usr/src/tools/ctf/cvt/ctf.c	2014-03-02 01:31:13.087707012 +0400
-+++ b/usr/src/tools/ctf/cvt/ctf.c	2014-03-02 01:32:56.594961513 +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: b/usr/src/tools/ctf/cvt/output.c
-===================================================================
---- a/usr/src/tools/ctf/cvt/output.c	2014-03-02 01:32:34.747700061 +0400
-+++ b/usr/src/tools/ctf/cvt/output.c	2014-03-02 01:32:56.596876989 +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: b/usr/src/tools/ctf/cvt/dwarf.c
-===================================================================
---- a/usr/src/tools/ctf/cvt/dwarf.c	2014-03-02 01:32:31.821517526 +0400
-+++ b/usr/src/tools/ctf/cvt/dwarf.c	2014-03-02 01:32:56.600955825 +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/cw-allow-ccache.patch b/onbld/debian/patches/cw-allow-ccache.patch
index 8fa2698..f324ff0 100644
--- a/onbld/debian/patches/cw-allow-ccache.patch
+++ b/onbld/debian/patches/cw-allow-ccache.patch
@@ -1,9 +1,9 @@
 Description: Allow using simply "gcc" which can be ccache in $PATH
-Index: b/usr/src/tools/cw/cw.c
+Index: onbld/usr/src/tools/cw/cw.c
 ===================================================================
---- a/usr/src/tools/cw/cw.c	2014-03-02 01:32:37.588867046 +0400
-+++ b/usr/src/tools/cw/cw.c	2014-03-02 01:33:00.208568406 +0400
-@@ -1685,7 +1685,7 @@
+--- onbld.orig/usr/src/tools/cw/cw.c
++++ onbld/usr/src/tools/cw/cw.c
+@@ -1690,7 +1690,7 @@ invoke(cw_ictx_t *ctx)
  		return (-1);
  	}
  
diff --git a/onbld/debian/patches/cw-support-YP.patch b/onbld/debian/patches/cw-support-YP.patch
index c8cbc88..3cd1485 100644
--- a/onbld/debian/patches/cw-support-YP.patch
+++ b/onbld/debian/patches/cw-support-YP.patch
@@ -1,8 +1,8 @@
-Index: b/usr/src/tools/cw/cw.c
+Index: onbld/usr/src/tools/cw/cw.c
 ===================================================================
---- a/usr/src/tools/cw/cw.c	2014-03-02 01:31:20.442220564 +0400
-+++ b/usr/src/tools/cw/cw.c	2014-03-02 01:32:37.588867046 +0400
-@@ -1389,6 +1389,11 @@
+--- onbld.orig/usr/src/tools/cw/cw.c
++++ onbld/usr/src/tools/cw/cw.c
+@@ -1394,6 +1394,11 @@ do_gcc(cw_ictx_t *ctx)
  			/* Just ignore -YS,... for now */
  			if (strncmp(arg, "S,", 2) == 0)
  				break;
diff --git a/onbld/debian/patches/gnu-ld.patch b/onbld/debian/patches/gnu-ld.patch
index dd67938..7475b03 100644
--- a/onbld/debian/patches/gnu-ld.patch
+++ b/onbld/debian/patches/gnu-ld.patch
@@ -3,11 +3,11 @@ Description: Drop LDFLAGS not supported by GNU ld
  which sunld does not understand. So we choose to use GNU ld
  to build onbld.
 
-Index: b/usr/src/tools/Makefile.tools
+Index: onbld/usr/src/tools/Makefile.tools
 ===================================================================
---- a/usr/src/tools/Makefile.tools	2014-03-02 01:31:35.368568358 +0400
-+++ b/usr/src/tools/Makefile.tools	2014-03-02 01:31:55.537216641 +0400
-@@ -49,8 +49,6 @@
+--- onbld.orig/usr/src/tools/Makefile.tools
++++ onbld/usr/src/tools/Makefile.tools
+@@ -51,8 +51,6 @@ ROOTONBLDSHARE=		$(ROOTONBLD)/share
  CPPFLAGS=		-D_TS_ERRNO
  ELFSIGN_O=		$(TRUE)
  LDLIBS=
@@ -16,11 +16,11 @@ Index: b/usr/src/tools/Makefile.tools
  
  ROOTONBLDPROG=		$(PROG:%=$(ROOTONBLDBIN)/%)
  ROOTONBLDMACHPROG=	$(PROG:%=$(ROOTONBLDBINMACH)/%)
-Index: b/usr/src/tools/cw/Makefile
+Index: onbld/usr/src/tools/cw/Makefile
 ===================================================================
---- a/usr/src/tools/cw/Makefile	2014-03-02 01:31:35.368644577 +0400
-+++ b/usr/src/tools/cw/Makefile	2014-03-02 01:31:55.539391002 +0400
-@@ -45,7 +45,6 @@
+--- onbld.orig/usr/src/tools/cw/Makefile
++++ onbld/usr/src/tools/cw/Makefile
+@@ -45,7 +45,6 @@ $(__SUNC)CFLAGS=	-xspace -Xa  -xildoff -
  
  
  $(__GNUC)LDLIBS +=	-lc
diff --git a/onbld/debian/patches/less.patch b/onbld/debian/patches/less.patch
new file mode 100644
index 0000000..86cb90a
--- /dev/null
+++ b/onbld/debian/patches/less.patch
@@ -0,0 +1,72 @@
+Index: onbld/usr/src/tools/Makefile
+===================================================================
+--- onbld.orig/usr/src/tools/Makefile
++++ onbld/usr/src/tools/Makefile
+@@ -33,30 +33,15 @@ BOOT_SUBDIRS= \
+ 	cw
+ 
+ COMMON_SUBDIRS= \
+-	codereview \
+-	codesign \
+-	cscope-fast \
+ 	ctf \
+-	depcheck \
+-	env \
+-	findunref \
+-	gk \
+-	install.bin \
+-	lintdump \
+-	make \
+ 	ndrgen \
+-	onbld \
+-	pmodes \
+-	protocmp \
+-	protolist \
+-	scripts
++
+ 
+ #
+ #  special versions of commands for use only in build
+ #
+ UNSHIPPED_SUBDIRS = \
+-	elfsign \
+-	mandoc
++
+ 
+ sparc_SUBDIRS= \
+ 	chk4ubin \
+@@ -93,17 +78,9 @@ ROOTDIRS= \
+ 	$(ROOTONBLD)/lib \
+ 	$(ROOTONBLD)/lib/$(MACH) \
+ 	$(ROOTONBLD)/lib/$(MACH)/64 \
+-	$(ROOTONBLD)/lib/perl \
+-	$(ROOTONBLD)/lib/python2.6 \
+-	$(ROOTONBLD)/lib/python2.6/onbld \
+-	$(ROOTONBLD)/lib/python2.6/onbld/Checks \
+-	$(ROOTONBLD)/lib/python2.6/onbld/hgext \
+-	$(ROOTONBLD)/lib/python2.6/onbld/Scm \
+-	$(ROOTONBLD)/env \
+ 	$(ROOTONBLD)/etc \
+ 	$(ROOTONBLD)/etc/exception_lists \
+ 	$(ROOTONBLD)/share \
+-	$(ROOTONBLD)/gk \
+ 	$(ROOTONBLD)/man \
+ 	$(ROOTONBLD)/man/man1onbld
+ 
+@@ -139,15 +116,12 @@ _msg: $(MSGSUBDIRS)
+ 
+ $(SUBDIRS) $(CLOSED_SUBDIRS): $(BOOT_SUBDIRS)
+ 
+-$(BOOT_SUBDIRS) $(SUBDIRS): $$(DOROOTDIRS) $(ROOTONBLDLIBPY) FRC
++$(BOOT_SUBDIRS) $(SUBDIRS): $$(DOROOTDIRS) FRC
+ 	@cd $@; pwd; $(MAKE) $(TARGET)
+ 
+ $(ROOTDIRS):
+ 	$(INS.dir)
+ 
+-$(ROOTONBLDLIBPY): $(ROOTDIRS)
+-	$(RM) -r $@; $(SYMLINK) python2.6 $@
+-
+ make: ctf
+ 
+ FRC:
diff --git a/onbld/debian/patches/no-elfsign.patch b/onbld/debian/patches/no-elfsign.patch
deleted file mode 100644
index 0ac311e..0000000
--- a/onbld/debian/patches/no-elfsign.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Do not build elfsign.
- It requires many libs, and does not make much sense
- with packaging system.
-Index: b/usr/src/tools/Makefile
-===================================================================
---- a/usr/src/tools/Makefile	2014-03-02 01:32:04.588682686 +0400
-+++ b/usr/src/tools/Makefile	2014-03-02 01:32:16.840910988 +0400
-@@ -51,7 +51,6 @@
- #  special versions of commands for use only in build
- #
- UNSHIPPED_SUBDIRS = \
--	elfsign
- 
- sparc_SUBDIRS= \
- 	chk4ubin \
diff --git a/onbld/debian/patches/no-exception_lists.patch b/onbld/debian/patches/no-exception_lists.patch
index 026fc43..0d69759 100644
--- a/onbld/debian/patches/no-exception_lists.patch
+++ b/onbld/debian/patches/no-exception_lists.patch
@@ -1,8 +1,8 @@
-Index: b/usr/src/tools/scripts/Makefile
+Index: onbld/usr/src/tools/scripts/Makefile
 ===================================================================
---- a/usr/src/tools/scripts/Makefile	2014-03-02 01:31:18.126410325 +0400
-+++ b/usr/src/tools/scripts/Makefile	2014-03-02 01:32:40.674410069 +0400
-@@ -112,9 +112,6 @@
+--- onbld.orig/usr/src/tools/scripts/Makefile
++++ onbld/usr/src/tools/scripts/Makefile
+@@ -112,9 +112,6 @@ ETCFILES= \
  	its.reg
  
  EXCEPTFILES= \
@@ -10,5 +10,5 @@ Index: b/usr/src/tools/scripts/Makefile
 -	interface_check \
 -	interface_cmp
  
- CLEANFILES = $(SHFILES) $(PERLFILES) $(PYFILES) bldenv.1
+ CLEANFILES = $(SHFILES) $(PERLFILES) $(PYFILES) bldenv.1onbld
  
diff --git a/onbld/debian/patches/no-install.patch b/onbld/debian/patches/no-install.patch
deleted file mode 100644
index 261fcb8..0000000
--- a/onbld/debian/patches/no-install.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Do not build "install"
- We use "install" from GNU coreutils,
- and it is not compatible with this "install"
-Index: b/usr/src/tools/Makefile
-===================================================================
---- a/usr/src/tools/Makefile	2014-03-02 01:32:01.757634087 +0400
-+++ b/usr/src/tools/Makefile	2014-03-02 01:32:04.588682686 +0400
-@@ -42,7 +42,6 @@
- 	ndrgen \
- 	pmodes \
- 	gk \
--	install.bin \
- 	lintdump \
- 	protocmp \
- 	protolist \
diff --git a/onbld/debian/patches/no-python.patch b/onbld/debian/patches/no-python.patch
deleted file mode 100644
index 635d291..0000000
--- a/onbld/debian/patches/no-python.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Do not build Python modules
- We will install them in debian/rules to proper location
- and for proper Python versions.
-
-Index: b/usr/src/tools/Makefile
-===================================================================
---- a/usr/src/tools/Makefile	2014-03-02 01:31:34.037341678 +0400
-+++ b/usr/src/tools/Makefile	2014-03-02 01:32:01.757634087 +0400
-@@ -40,7 +40,6 @@
- 	env \
- 	findunref \
- 	ndrgen \
--	onbld \
- 	pmodes \
- 	gk \
- 	install.bin \
-@@ -90,11 +89,6 @@
- 	$(ROOTONBLD)/lib \
- 	$(ROOTONBLD)/lib/$(MACH) \
- 	$(ROOTONBLD)/lib/perl \
--	$(ROOTONBLD)/lib/python2.6 \
--	$(ROOTONBLD)/lib/python2.6/onbld \
--	$(ROOTONBLD)/lib/python2.6/onbld/Checks \
--	$(ROOTONBLD)/lib/python2.6/onbld/hgext \
--	$(ROOTONBLD)/lib/python2.6/onbld/Scm \
- 	$(ROOTONBLD)/env \
- 	$(ROOTONBLD)/etc \
- 	$(ROOTONBLD)/etc/exception_lists \
diff --git a/onbld/debian/patches/postpone-ctf-stabs.patch b/onbld/debian/patches/postpone-ctf-stabs.patch
index ab09777..4b4bdc3 100644
--- a/onbld/debian/patches/postpone-ctf-stabs.patch
+++ b/onbld/debian/patches/postpone-ctf-stabs.patch
@@ -2,16 +2,16 @@ Description: Postpone building ctfstubs
  because it needs libctf and building libctf requires
  other CTF tools. So, we build everything but ctfstubs,
  then libctf, then ctfstabs.
-Index: b/usr/src/tools/ctf/Makefile
+Index: onbld/usr/src/tools/ctf/Makefile
 ===================================================================
---- a/usr/src/tools/ctf/Makefile	2014-03-02 01:31:52.558629814 +0400
-+++ b/usr/src/tools/ctf/Makefile	2014-03-02 01:32:19.628113527 +0400
+--- onbld.orig/usr/src/tools/ctf/Makefile
++++ onbld/usr/src/tools/ctf/Makefile
 @@ -26,7 +26,7 @@
  
  include ../Makefile.tools
  
--SUBDIRS = cvt dump stabs scripts ctfstrip
-+SUBDIRS = cvt dump scripts ctfstrip
+-SUBDIRS = cvt dump stabs ctfstrip
++SUBDIRS = cvt dump ctfstrip
  
  .PARALLEL: $(SUBDIRS)
  
diff --git a/onbld/debian/patches/scanner.flex.patch b/onbld/debian/patches/scanner.flex.patch
deleted file mode 100644
index b875b24..0000000
--- a/onbld/debian/patches/scanner.flex.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Adapt for using flex.
- Note: flex must be executed in compatibility mode (-l)
-
-Index: b/usr/src/tools/cscope-fast/scanner.l
-===================================================================
---- a/usr/src/tools/cscope-fast/scanner.l	2014-03-02 01:31:38.525148878 +0400
-+++ b/usr/src/tools/cscope-fast/scanner.l	2014-03-02 01:31:46.193538315 +0400
-@@ -40,6 +40,16 @@
- 
- /* the line counting has been moved from character reading for speed */
- /* comments are discarded */
-+
-+#define YY_NO_INPUT 1
-+int yytchar;
-+#ifndef YYLMAX
-+#define YYLMAX BUFSIZ
-+#endif
-+char yysbuf[YYLMAX];
-+char *yysptr = yysbuf;
-+int yylineno;
-+
- #undef	input
- #define	input() \
- 	((yytchar = (yytchar = yysptr > yysbuf ? \
-@@ -633,7 +643,7 @@
- \n		{	/* end of the line */
- 			if (ppdefine == YES) {	/* end of a #define */
- 				ppdefine = NO;
--				(void) yyless(yyleng - 1);	/* rescan \n */
-+				yyless(yyleng - 1);	/* rescan \n */
- 				last = first;
- 				yymore();
- 				return (DEFINEEND);
diff --git a/onbld/debian/patches/series b/onbld/debian/patches/series
index 961508c..48abe44 100644
--- a/onbld/debian/patches/series
+++ b/onbld/debian/patches/series
@@ -1,14 +1,10 @@
 bool.patch
-scanner.flex.patch
 use-intptr_t.patch
 use-system-libdwarf.patch
 gnu-ld.patch
 ndrgen.bison.patch
-no-python.patch
-no-install.patch
 protocmp.x86_64.patch
 protolist.x86_64.patch
-no-elfsign.patch
 postpone-ctf-stabs.patch
 local-libctf.patch
 path.patch
@@ -21,5 +17,6 @@ libctf-headers.patch
 ctfstabs-lib.patch
 libctf-dlopen-libz.patch
 missing-zconf.h.patch
-cvt-pointers.patch
 cw-allow-ccache.patch
+less.patch
+ctf-no-clobbered.patch
diff --git a/onbld/debian/patches/use-intptr_t.patch b/onbld/debian/patches/use-intptr_t.patch
index 8973e2a..734efbb 100644
--- a/onbld/debian/patches/use-intptr_t.patch
+++ b/onbld/debian/patches/use-intptr_t.patch
@@ -1,8 +1,8 @@
-Index: b/usr/src/tools/cscope-fast/cgrep.c
+Index: onbld/usr/src/tools/cscope-fast/cgrep.c
 ===================================================================
---- a/usr/src/tools/cscope-fast/cgrep.c	2014-03-02 01:31:37.818247496 +0400
-+++ b/usr/src/tools/cscope-fast/cgrep.c	2014-03-02 01:31:49.025259409 +0400
-@@ -1045,7 +1045,7 @@
+--- onbld.orig/usr/src/tools/cscope-fast/cgrep.c
++++ onbld/usr/src/tools/cscope-fast/cgrep.c
+@@ -1045,7 +1045,7 @@ d3(re_re *r, PATTERN *pat)
  {
  	Expr *e;
  	uchar_t *tab;
@@ -11,10 +11,10 @@ Index: b/usr/src/tools/cscope-fast/cgrep.c
  
  	switch (toktype) {
  	case Backslash:
-Index: b/usr/src/tools/ctf/cvt/alist.c
+Index: onbld/usr/src/tools/ctf/cvt/alist.c
 ===================================================================
---- a/usr/src/tools/ctf/cvt/alist.c	2014-03-02 01:31:37.818582950 +0400
-+++ b/usr/src/tools/ctf/cvt/alist.c	2014-03-02 01:31:49.027717741 +0400
+--- onbld.orig/usr/src/tools/ctf/cvt/alist.c
++++ onbld/usr/src/tools/ctf/cvt/alist.c
 @@ -33,6 +33,7 @@
  
  #include <stdio.h>
@@ -23,7 +23,7 @@ Index: b/usr/src/tools/ctf/cvt/alist.c
  
  #include "alist.h"
  #include "memory.h"
-@@ -171,13 +172,13 @@
+@@ -171,13 +172,13 @@ alist_def_print_cb(void *key, void *valu
  {
  	printf("Key: ");
  	if (alist_def_print_cb_key_int == 1)
@@ -39,19 +39,19 @@ Index: b/usr/src/tools/ctf/cvt/alist.c
  	else
  		printf("%s\n", (char *)key);
  
-Index: b/usr/src/tools/ctf/cvt/ctftools.h
+Index: onbld/usr/src/tools/ctf/cvt/ctftools.h
 ===================================================================
---- a/usr/src/tools/ctf/cvt/ctftools.h	2014-03-02 01:31:37.818886151 +0400
-+++ b/usr/src/tools/ctf/cvt/ctftools.h	2014-03-02 01:31:49.031615955 +0400
-@@ -38,6 +38,7 @@
+--- onbld.orig/usr/src/tools/ctf/cvt/ctftools.h
++++ onbld/usr/src/tools/ctf/cvt/ctftools.h
+@@ -36,6 +36,7 @@
  #include <libelf.h>
  #include <gelf.h>
  #include <pthread.h>
 +#include <inttypes.h>
  
- #ifdef __cplusplus
- extern "C" {
-@@ -207,7 +208,7 @@
+ #include <sys/ccompile.h>
+ 
+@@ -207,7 +208,7 @@ typedef struct fndef {
  	uint_t fn_vargs;
  } fndef_t;
  
@@ -60,11 +60,11 @@ Index: b/usr/src/tools/ctf/cvt/ctftools.h
  
  /*
   * The tdesc_t (Type DESCription) is the basic node type used in the stabs data
-Index: b/usr/src/tools/ctf/cvt/merge.c
+Index: onbld/usr/src/tools/ctf/cvt/merge.c
 ===================================================================
---- a/usr/src/tools/ctf/cvt/merge.c	2014-03-02 01:31:37.819113688 +0400
-+++ b/usr/src/tools/ctf/cvt/merge.c	2014-03-02 01:31:49.036327353 +0400
-@@ -188,12 +188,12 @@
+--- onbld.orig/usr/src/tools/ctf/cvt/merge.c
++++ onbld/usr/src/tools/ctf/cvt/merge.c
+@@ -188,12 +188,12 @@ add_mapping(alist_t *ta, tid_t srcid, ti
  }
  
  static tid_t
@@ -80,7 +80,7 @@ Index: b/usr/src/tools/ctf/cvt/merge.c
  	else
  		return (0);
  }
-@@ -908,7 +908,7 @@
+@@ -908,7 +908,7 @@ static int
  redir_mstr_fwd_cb(void *name, void *value, void *arg)
  {
  	tdesc_t *fwd = name;
@@ -89,7 +89,7 @@ Index: b/usr/src/tools/ctf/cvt/merge.c
  	redir_mstr_data_t *rmd = arg;
  	tdesc_t template;
  	tdesc_t *defn;
-@@ -917,7 +917,7 @@
+@@ -917,7 +917,7 @@ redir_mstr_fwd_cb(void *name, void *valu
  
  	if (!hash_find(rmd->rmd_tgt->td_idhash, (void *)&template,
  	    (void *)&defn)) {
diff --git a/onbld/debian/rules b/onbld/debian/rules
index 3b128b1..e52229c 100755
--- a/onbld/debian/rules
+++ b/onbld/debian/rules
@@ -1,73 +1,78 @@
 #!/usr/bin/make -f
 
 include /usr/share/dpkg/architecture.mk
+VERSION := $(shell dpkg-parsechangelog | perl -ne '/Version:\s+(.+)-[^-]+/ && print $$1')
 
 export DH_VERBOSE = 1
 
-unpack: unpack-stamp
-unpack-stamp:
-	dh_testdir
-	dh_illumos_gate --build \
-		usr/src/tools \
-		usr/src/lib/libctf \
-		usr/src/common/ctf \
-		usr/src/uts/common/sys/ctf.h \
-		usr/src/uts/common/sys/ctf_api.h \
-		usr/src/uts/common/sys/multiboot.h
-
-	# install into debian/tmp:
-	echo 'export TOOLS_PROTO="$$ROOT"' >> usr/env.sh
-	echo 'export SAVEARGS=' >> usr/env.sh
-	sed -i '/^TOOLS_PROTO=/d' usr/bldenv.sh
-	touch $@
-
-patch: patch-stamp
-patch-stamp: unpack-stamp
-	dh_testdir
-	[ ! -f debian/patches/series ] || QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-	touch $@
-
-unpatch:
-	dh_testdir
-	[ ! -f debian/patches/series ] || QUILT_PATCHES=debian/patches quilt pop -a -f || test $$? = 2
-	rm -f patch-stamp
-
-dirs-stamp:
-	. usr/env.sh; mkdir -p \
-		debian/tmp/usr/include \
-		debian/tmp/usr/include/sys \
-		debian/tmp$$DEB_LIBDIR_32 \
-		debian/tmp$$DEB_LIBDIR_64 \
-		debian/tmp$$DEB_USRLIBDIR_32 \
-		debian/tmp$$DEB_USRLIBDIR_64
-	touch $@
-
-headers-stamp: patch-stamp dirs-stamp
-	dh_illumos_make usr/src/lib/libctf -t install_h
-	cp usr/src/uts/common/sys/*.h debian/tmp/usr/include/sys/
-	touch $@
-
-
-install build build-arch build-indep: build-stamp
-build-stamp: patch-stamp headers-stamp dirs-stamp
-	# ctfstabs needs libctf, libctf needs ctfconvert
-	# We've disabled ctfstabs via patch to build all tools
-	# not requiring libctf, then build libctf, then - ctfstabs:
-	
-	# libncurses.so is actually linker script
+%:
+	dh $@
+
+
+BUILD = build-tree
+ROOT = $(BUILD)/root
+ILLUMOS_GATE = illumos-gate
+
+$(ILLUMOS_GATE):
+	dh_illumos_gate --checkout --destdir=$(ILLUMOS_GATE)
+
+.PHONY: create-orig
+create-orig: $(ILLUMOS_GATE)
+	dh_illumos_gate --create-orig --build \
+		$(ILLUMOS_GATE)/usr/src/tools \
+		$(ILLUMOS_GATE)/usr/src/lib/libctf \
+		$(ILLUMOS_GATE)/usr/src/common/ctf \
+		$(ILLUMOS_GATE)/usr/src/uts/common/sys/ctf.h \
+		$(ILLUMOS_GATE)/usr/src/uts/common/sys/ctf_api.h \
+		$(ILLUMOS_GATE)/usr/src/uts/common/sys/multiboot.h
+
+test-orig: create-orig
+	./debian/rules clean
+	rm -rf usr .pc
+	tar xf ../onbld_$(VERSION).orig.tar.xz --strip=1
+	quilt push -a
+	./debian/rules build
+	fakeroot ./debian/rules binary
+
+
+override_dh_auto_configure:
+	dh_illumos_gate --configure --destdir=$(BUILD) --root=$(ROOT)
+
+
+override_dh_auto_build:
+	. $(BUILD)/usr/env.sh; mkdir -p \
+		$(ROOT)/usr/include \
+		$(ROOT)/usr/include/sys \
+		$(ROOT)$$DEB_LIBDIR_32 \
+		$(ROOT)$$DEB_LIBDIR_64 \
+		$(ROOT)$$DEB_USRLIBDIR_32 \
+		$(ROOT)$$DEB_USRLIBDIR_64
+
+	dh_illumos_make $(BUILD)/usr/src/lib/libctf -t install_h
+	cp usr/src/uts/common/sys/*.h $(ROOT)/usr/include/sys/
+
+	# libncurses.so is actually a linker script
 	# and sunld does not understand it,
 	# but we do not need sunld here ;-)
-	sed -i -r 's/.*(export +LD_ALTEXEC.*)/#\1/' usr/env.sh
-	dh_illumos_make --no-onbld --native usr/src/tools
+	sed -i -r 's/.*(export +LD_ALTEXEC.*)/#\1/' $(BUILD)/usr/env.sh
+	dh_illumos_make --no-onbld --native $(BUILD)/usr/src/tools
+
 	# Then we need sunld:
-	sed -i -r 's/#(export +LD_ALTEXEC.*)/\1/' usr/env.sh
-	dh_illumos_make --no-onbld usr/src/lib/libctf -t install_h
-	dh_illumos_make --no-onbld usr/src/lib/libctf
+	sed -i -r 's/#(export +LD_ALTEXEC.*)/\1/' $(BUILD)/usr/env.sh
+	dh_illumos_make --no-onbld $(BUILD)/usr/src/lib/libctf -t install_h
+	dh_illumos_make --no-onbld $(BUILD)/usr/src/lib/libctf
+
 	# Then - don't:
-	sed -i -r 's/(export +LD_ALTEXEC.*)/#\1/' usr/env.sh
-	dh_illumos_make --no-onbld --native usr/src/tools/ctf/stabs
+	sed -i -r 's/(export +LD_ALTEXEC.*)/#\1/' $(BUILD)/usr/env.sh
+	dh_illumos_make --no-onbld --native $(BUILD)/usr/src/tools/ctf/stabs
+
+
+override_dh_auto_install:
+	rm -rf debian/tmp
+	cp -a $(ROOT) debian/tmp
+	cp -a $(BUILD)/usr/src/tools/proto/root_i386-nd/opt debian/tmp/opt
+	cp -a $(BUILD)/usr/src/tools/scripts/genoffsets.pl debian/tmp/opt/onbld/bin/genoffsets
 
-	# Move dev symlink from /lib into /usr/lib:
 	for l in `find debian/tmp/lib32 -maxdepth 1 -type l -name \*.so`; do \
 		ln -sf `readlink -f $$l` debian/tmp/usr/lib32/`basename $$l`; \
 		rm $$l; \
@@ -76,36 +81,10 @@ build-stamp: patch-stamp headers-stamp dirs-stamp
 		ln -sf `readlink -f $$l` debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/`basename $$l`; \
 		rm $$l; \
 	done
-	# Make symlinks relative:
 	symlinks -c debian/tmp/usr/lib32
 	symlinks -c debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
-	touch $@
-
-binary binary-arch binary-indep: binary-stamp
-binary-stamp: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_install
-	dh_python2
-	dh_installman
-	dh_installdocs
-	dh_installexamples
-	dh_installchangelogs
-	dh_strip
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs -- -c4
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-	touch $@
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	dh_clean
-	rm -rf usr
+
+
+override_dh_auto_clean:
+	rm -rf $(BUILD)
 
diff --git a/onbld/debian/source/format b/onbld/debian/source/format
index 89ae9db..163aaf8 100644
--- a/onbld/debian/source/format
+++ b/onbld/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)
diff --git a/onbld/debian/webrev.install b/onbld/debian/webrev.install
deleted file mode 100644
index 329c19b..0000000
--- a/onbld/debian/webrev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-/opt/onbld/bin/webrev /usr/bin/
-/opt/onbld/bin/which_scm /usr/bin/
-/opt/onbld/bin/wdiff
-/opt/onbld/man/man1/wsdiff.1
diff --git a/onbld/debian/webrev.manpages b/onbld/debian/webrev.manpages
deleted file mode 100644
index 3ed7553..0000000
--- a/onbld/debian/webrev.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/opt/onbld/man/man1/webrev.1
-debian/tmp/opt/onbld/man/man1/which_scm.1