libc 4.3: updated patches

author: Igor Pashev <pashev.igor@gmail.com> 2014-03-02 23:28:12 +0400
committer: Igor Pashev <pashev.igor@gmail.com> 2014-03-02 23:28:12 +0400
commit: f7b1409c7351d68c15dc7ef208323fcbac34966d (patch)
tree: 2932987627b89afc408424b95d01d1c15a7fce54 /libc/debian
parent: 39b7e5055c452b7b84967bd0938e3c8f96c5cfb1 (diff)
download: illumos-packaging-f7b1409c7351d68c15dc7ef208323fcbac34966d.tar.gz
114 files changed, 872 insertions, 1997 deletions
diff --git a/libc/debian/changelog b/libc/debian/changelog
index 4380bca..bf75286 100644
--- a/libc/debian/changelog
+++ b/libc/debian/changelog
@@ -1,3 +1,20 @@
+libc (4.3) UNRELEASED; urgency=medium
+
+  * New upstream snapshot
+  * Updated patches
+  * Removed patches (applied upstream):
+    illumos-195-librpcsvc.patch
+    illumos-3141-strptime-t.patch
+    illumos-3436-relocatable-objects-also-need-sloppy-relocation.patch
+    illumos-3439-discarded-sections-shouldn-t-end-up-on-output-l.patch
+    illumos-3453-GNU-comdat-redirection-does-exactly-the-wrong-t.patch
+    illumos-3687-fopen-e.patch
+    illumos-3787.patch
+    illumos-4294-fopen-x.patch
+    illumos-72-libnsl-t_error.patch
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sun, 02 Mar 2014 22:53:31 +0400
+
 libc (2.10+16) unstable; urgency=medium
 
   * Added qsort_r() [libc-add-qsort_r.patch]
diff --git a/libc/debian/control b/libc/debian/control
index 07c491c..4ad5344 100644
--- a/libc/debian/control
+++ b/libc/debian/control
@@ -10,12 +10,12 @@ Build-Depends:
  dtrace-dev,
  flex,
  gcc-multilib,
- illumos-source-2.10,
+ illumos-source-4.3,
  ksh,
  m4,
  onbld,
  symlinks,
- uts-dev ( >= 2.10-2 ),
+ uts-dev ( >= 4.3 ),
 Build-Conflicts: libelf-dev, libelf1-dev, libelfg0-dev, libavl-dev, libavl1-dev,
  libsunelf-dev,
 Standards-Version: 3.9.2
diff --git a/libc/debian/patches/add-TEMP_FAILURE_RETRY.patch b/libc/debian/patches/add-TEMP_FAILURE_RETRY.patch
index dee2baa..2ac013d 100644
--- a/libc/debian/patches/add-TEMP_FAILURE_RETRY.patch
+++ b/libc/debian/patches/add-TEMP_FAILURE_RETRY.patch
@@ -1,8 +1,8 @@
-Index: libc/usr/src/head/unistd.h
+Index: b/usr/src/head/unistd.h
 ===================================================================
---- libc.orig/usr/src/head/unistd.h	2013-03-05 22:41:08.212211028 +0000
-+++ libc/usr/src/head/unistd.h	2013-03-05 23:07:21.804712697 +0000
-@@ -1014,6 +1014,19 @@
+--- a/usr/src/head/unistd.h	2014-03-02 23:19:52.147725660 +0400
++++ b/usr/src/head/unistd.h	2014-03-02 23:23:33.560744425 +0400
+@@ -1114,6 +1114,19 @@
  
  #endif /* defined(__EXTENSIONS__) || defined(_REENTRANT)... */
  
diff --git a/libc/debian/patches/add-libutil-openpty-forkpty.patch b/libc/debian/patches/add-libutil-openpty-forkpty.patch
index d544363..0f5be59 100644
--- a/libc/debian/patches/add-libutil-openpty-forkpty.patch
+++ b/libc/debian/patches/add-libutil-openpty-forkpty.patch
@@ -3,10 +3,10 @@ Description: add libutil with openpty(), forkpty() and login_tty()
  unconditionally: open() will do it for us if __xpg4 != 0, see
  usr/src/lib/libc/port/sys/open.c. If we do push modules too,
  termninal settings are reset, so we have 24x80 when login via ssh :-)
-Index: libc/usr/src/head/pty.h
+Index: b/usr/src/head/pty.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/head/pty.h	2013-07-27 05:03:08.751696819 +0400
++++ b/usr/src/head/pty.h	2014-03-02 23:24:07.773731082 +0400
 @@ -0,0 +1,39 @@
 +/*
 +Copyright: 2013, Igor Pashev <pashev.igor@gmail.com>
@@ -47,10 +47,10 @@ Index: libc/usr/src/head/pty.h
 +
 +#endif  /* pty.h */
 +
-Index: libc/usr/src/head/utmp.h
+Index: b/usr/src/head/utmp.h
 ===================================================================
---- libc.orig/usr/src/head/utmp.h	2012-10-08 04:25:37.000000000 +0400
-+++ libc/usr/src/head/utmp.h	2013-07-27 05:03:08.753207994 +0400
+--- a/usr/src/head/utmp.h	2014-03-02 23:19:39.578067004 +0400
++++ b/usr/src/head/utmp.h	2014-03-02 23:24:07.775538660 +0400
 @@ -171,6 +171,10 @@
  
  #endif /* !defined(_XPG4_2) || defined(__EXTENSIONS__) */
@@ -62,10 +62,10 @@ Index: libc/usr/src/head/utmp.h
  #ifdef	__cplusplus
  }
  #endif
-Index: libc/usr/src/lib/libutil/Makefile
+Index: b/usr/src/lib/libutil/Makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/lib/libutil/Makefile	2013-07-27 05:03:08.754646101 +0400
++++ b/usr/src/lib/libutil/Makefile	2014-03-02 23:24:07.777109107 +0400
 @@ -0,0 +1,23 @@
 +include ../Makefile.lib
 +
@@ -90,10 +90,10 @@ Index: libc/usr/src/lib/libutil/Makefile
 +FRC:
 +
 +include ../Makefile.targ
-Index: libc/usr/src/head/Makefile
+Index: b/usr/src/head/Makefile
 ===================================================================
---- libc.orig/usr/src/head/Makefile	2013-07-27 05:03:08.374908783 +0400
-+++ libc/usr/src/head/Makefile	2013-07-27 05:03:08.756162752 +0400
+--- a/usr/src/head/Makefile	2014-03-02 23:24:01.573054777 +0400
++++ b/usr/src/head/Makefile	2014-03-02 23:24:07.778577667 +0400
 @@ -141,6 +141,7 @@
  	prof.h		\
  	project.h	\
@@ -102,10 +102,10 @@ Index: libc/usr/src/head/Makefile
  	pw.h		\
  	pwd.h		\
  	rctl.h		\
-Index: libc/usr/src/lib/libutil/Makefile.com
+Index: b/usr/src/lib/libutil/Makefile.com
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/lib/libutil/Makefile.com	2013-07-27 05:03:08.757176034 +0400
++++ b/usr/src/lib/libutil/Makefile.com	2014-03-02 23:24:07.779882316 +0400
 @@ -0,0 +1,21 @@
 +LIBRARY = libutil.a
 +VERS = .1
@@ -128,29 +128,29 @@ Index: libc/usr/src/lib/libutil/Makefile.com
 +lint: lintcheck
 +
 +include ../../Makefile.targ
-Index: libc/usr/src/lib/libutil/amd64/Makefile
+Index: b/usr/src/lib/libutil/amd64/Makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/lib/libutil/amd64/Makefile	2013-07-27 05:03:08.758346881 +0400
++++ b/usr/src/lib/libutil/amd64/Makefile	2014-03-02 23:24:07.785705774 +0400
 @@ -0,0 +1,5 @@
 +include ../Makefile.com
 +include ../../Makefile.lib.64
 +
 +install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
 +
-Index: libc/usr/src/lib/libutil/i386/Makefile
+Index: b/usr/src/lib/libutil/i386/Makefile
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/lib/libutil/i386/Makefile	2013-07-27 05:03:08.759611350 +0400
++++ b/usr/src/lib/libutil/i386/Makefile	2014-03-02 23:24:07.787614053 +0400
 @@ -0,0 +1,4 @@
 +include ../Makefile.com
 +
 +install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
 +
-Index: libc/usr/src/lib/libutil/common/login_tty.c
+Index: b/usr/src/lib/libutil/common/login_tty.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/lib/libutil/common/login_tty.c	2013-07-27 05:03:08.761328919 +0400
++++ b/usr/src/lib/libutil/common/login_tty.c	2014-03-02 23:24:07.789184206 +0400
 @@ -0,0 +1,52 @@
 +/*-
 + * Copyright (c) 1990, 1993
@@ -204,10 +204,10 @@ Index: libc/usr/src/lib/libutil/common/login_tty.c
 +		(void) close(fd);
 +	return (0);
 +}
-Index: libc/usr/src/lib/libutil/common/pty.c
+Index: b/usr/src/lib/libutil/common/pty.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/lib/libutil/common/pty.c	2013-07-27 05:08:20.839330545 +0400
++++ b/usr/src/lib/libutil/common/pty.c	2014-03-02 23:24:07.790617651 +0400
 @@ -0,0 +1,125 @@
 +/*-
 + * Copyright (c) 1990, 1993, 1994
@@ -334,10 +334,10 @@ Index: libc/usr/src/lib/libutil/common/pty.c
 +	(void) close(slave);
 +	return (pid);
 +}
-Index: libc/usr/src/lib/libutil/common/mapfile-vers
+Index: b/usr/src/lib/libutil/common/mapfile-vers
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/lib/libutil/common/mapfile-vers	2013-07-27 05:03:08.763441646 +0400
++++ b/usr/src/lib/libutil/common/mapfile-vers	2014-03-02 23:24:07.792138395 +0400
 @@ -0,0 +1,11 @@
 +$mapfile_version 2
 +
diff --git a/libc/debian/patches/add-memrchr.patch b/libc/debian/patches/add-memrchr.patch
index ba35f29..f75926e 100644
--- a/libc/debian/patches/add-memrchr.patch
+++ b/libc/debian/patches/add-memrchr.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/head/string.h
+Index: b/usr/src/head/string.h
 ===================================================================
---- libc.orig/usr/src/head/string.h	2013-03-05 22:43:27.902479355 +0000
-+++ libc/usr/src/head/string.h	2013-03-05 23:16:56.428722076 +0000
+--- a/usr/src/head/string.h	2014-03-02 23:23:14.072577470 +0400
++++ b/usr/src/head/string.h	2014-03-02 23:23:35.767723294 +0400
 @@ -126,6 +126,7 @@
  #if defined(__EXTENSIONS__) || defined(_GNU_SOURCE)
  #define __mempcpy mempcpy
@@ -10,11 +10,11 @@ Index: libc/usr/src/head/string.h
  #endif
  
  #if defined(__EXTENSIONS__) || \
-Index: libc/usr/src/lib/libc/amd64/Makefile
+Index: b/usr/src/lib/libc/amd64/Makefile
 ===================================================================
---- libc.orig/usr/src/lib/libc/amd64/Makefile	2013-03-05 22:43:38.437753934 +0000
-+++ libc/usr/src/lib/libc/amd64/Makefile	2013-03-05 23:19:17.833741779 +0000
-@@ -446,6 +446,7 @@
+--- a/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:23:28.527980233 +0400
++++ b/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:23:35.771315039 +0400
+@@ -448,6 +448,7 @@
  	memalign.o		\
  	memmem.o		\
  	mempcpy.o		\
@@ -22,11 +22,11 @@ Index: libc/usr/src/lib/libc/amd64/Makefile
  	mkdev.o			\
  	mkdtemp.o		\
  	mkfifo.o		\
-Index: libc/usr/src/lib/libc/i386/Makefile.com
+Index: b/usr/src/lib/libc/i386/Makefile.com
 ===================================================================
---- libc.orig/usr/src/lib/libc/i386/Makefile.com	2013-03-05 22:43:38.439973735 +0000
-+++ libc/usr/src/lib/libc/i386/Makefile.com	2013-03-05 23:19:03.052057189 +0000
-@@ -477,6 +477,7 @@
+--- a/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:23:28.530105789 +0400
++++ b/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:23:35.774056030 +0400
+@@ -479,6 +479,7 @@
  	memalign.o		\
  	memmem.o		\
  	mempcpy.o		\
@@ -34,11 +34,11 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com
  	mkdev.o			\
  	mkdtemp.o		\
  	mkfifo.o		\
-Index: libc/usr/src/lib/libc/port/mapfile-vers
+Index: b/usr/src/lib/libc/port/mapfile-vers
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/mapfile-vers	2013-03-05 22:43:38.443873945 +0000
-+++ libc/usr/src/lib/libc/port/mapfile-vers	2013-03-05 23:19:41.124340155 +0000
-@@ -99,6 +99,7 @@
+--- a/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:23:28.533322797 +0400
++++ b/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:23:35.777427998 +0400
+@@ -134,6 +134,7 @@
          error_print_progname;
          flock;
          mempcpy;
@@ -46,10 +46,10 @@ Index: libc/usr/src/lib/libc/port/mapfile-vers
          program_invocation_name;
          program_invocation_short_name;
  } ILLUMOS_0.3;
-Index: libc/usr/src/lib/libc/port/gen/memrchr.c
+Index: b/usr/src/lib/libc/port/gen/memrchr.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/lib/libc/port/gen/memrchr.c	2013-03-06 00:01:22.811925632 +0000
++++ b/usr/src/lib/libc/port/gen/memrchr.c	2014-03-02 23:23:35.779333256 +0400
 @@ -0,0 +1,18 @@
 +#include<string.h>
 +
diff --git a/libc/debian/patches/add-rawmemchr.patch b/libc/debian/patches/add-rawmemchr.patch
index 96f36fa..bbcca08 100644
--- a/libc/debian/patches/add-rawmemchr.patch
+++ b/libc/debian/patches/add-rawmemchr.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/lib/libc/amd64/gen/rawmemchr.s
+Index: b/usr/src/lib/libc/amd64/gen/rawmemchr.s
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/lib/libc/amd64/gen/rawmemchr.s	2013-03-07 18:13:25.149534019 +0000
++++ b/usr/src/lib/libc/amd64/gen/rawmemchr.s	2014-03-02 23:23:38.862271501 +0400
 @@ -0,0 +1,96 @@
 +/*
 + * CDDL HEADER START
@@ -99,11 +99,11 @@ Index: libc/usr/src/lib/libc/amd64/gen/rawmemchr.s
 +	movq	%rdi,%rax
 +	ret
 +	SET_SIZE(rawmemchr)
-Index: libc/usr/src/lib/libc/amd64/Makefile
+Index: b/usr/src/lib/libc/amd64/Makefile
 ===================================================================
---- libc.orig/usr/src/lib/libc/amd64/Makefile	2013-03-07 16:49:21.817900285 +0000
-+++ libc/usr/src/lib/libc/amd64/Makefile	2013-03-07 16:49:22.026209778 +0000
-@@ -120,6 +120,7 @@
+--- a/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:23:35.771315039 +0400
++++ b/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:23:38.864909746 +0400
+@@ -122,6 +122,7 @@
  	new_list.o		\
  	proc64_id.o		\
  	proc64_support.o	\
@@ -111,11 +111,11 @@ Index: libc/usr/src/lib/libc/amd64/Makefile
  	setjmp.o		\
  	siginfolst.o		\
  	siglongjmp.o		\
-Index: libc/usr/src/lib/libc/port/mapfile-vers
+Index: b/usr/src/lib/libc/port/mapfile-vers
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/mapfile-vers	2013-03-07 16:49:21.824854359 +0000
-+++ libc/usr/src/lib/libc/port/mapfile-vers	2013-03-07 16:49:22.030855670 +0000
-@@ -102,6 +102,7 @@
+--- a/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:23:35.777427998 +0400
++++ b/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:23:38.869042820 +0400
+@@ -137,6 +137,7 @@
          memrchr;
          program_invocation_name;
          program_invocation_short_name;
@@ -123,10 +123,10 @@ Index: libc/usr/src/lib/libc/port/mapfile-vers
  } ILLUMOS_0.3;
  
  SYMBOL_VERSION ILLUMOS_0.3 {	# Illumos additions
-Index: libc/usr/src/lib/libc/i386/gen/rawmemchr.s
+Index: b/usr/src/lib/libc/i386/gen/rawmemchr.s
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/lib/libc/i386/gen/rawmemchr.s	2013-03-07 16:49:22.033397440 +0000
++++ b/usr/src/lib/libc/i386/gen/rawmemchr.s	2014-03-02 23:23:38.870961891 +0400
 @@ -0,0 +1,100 @@
 +/*
 + * CDDL HEADER START
@@ -228,11 +228,11 @@ Index: libc/usr/src/lib/libc/i386/gen/rawmemchr.s
 +	popl	%edi		/ restore register variable
 +	ret
 +	SET_SIZE(rawmemchr)
-Index: libc/usr/src/lib/libc/i386/Makefile.com
+Index: b/usr/src/lib/libc/i386/Makefile.com
 ===================================================================
---- libc.orig/usr/src/lib/libc/i386/Makefile.com	2013-03-07 16:49:21.820634465 +0000
-+++ libc/usr/src/lib/libc/i386/Makefile.com	2013-03-07 16:49:22.035261818 +0000
-@@ -130,6 +130,7 @@
+--- a/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:23:35.774056030 +0400
++++ b/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:23:38.872441557 +0400
+@@ -132,6 +132,7 @@
  	memcpy.o		\
  	memset.o		\
  	new_list.o		\
@@ -240,10 +240,10 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com
  	setjmp.o		\
  	siginfolst.o		\
  	siglongjmp.o		\
-Index: libc/usr/src/head/string.h
+Index: b/usr/src/head/string.h
 ===================================================================
---- libc.orig/usr/src/head/string.h	2013-03-07 16:49:21.812980489 +0000
-+++ libc/usr/src/head/string.h	2013-03-07 16:49:22.037541443 +0000
+--- a/usr/src/head/string.h	2014-03-02 23:23:35.767723294 +0400
++++ b/usr/src/head/string.h	2014-03-02 23:23:38.875993767 +0400
 @@ -127,6 +127,7 @@
  #define __mempcpy mempcpy
  extern void *mempcpy(void *, const void *, size_t);
diff --git a/libc/debian/patches/binaries-use-gnu-ld.patch b/libc/debian/patches/binaries-use-gnu-ld.patch
index 27194cd..72ed2a3 100644
--- a/libc/debian/patches/binaries-use-gnu-ld.patch
+++ b/libc/debian/patches/binaries-use-gnu-ld.patch
@@ -1,9 +1,9 @@
 Description: crt1.o: R_AMD64_GOT32 not supported by sunld
  Probably, caused by crt1.o-amd64-PIE.patch
-Index: libc/usr/src/cmd/sgs/ld/Makefile.com
+Index: b/usr/src/cmd/sgs/ld/Makefile.com
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/ld/Makefile.com	2013-11-24 17:01:40.320195479 +0400
-+++ libc/usr/src/cmd/sgs/ld/Makefile.com	2013-11-24 17:01:48.313483830 +0400
+--- a/usr/src/cmd/sgs/ld/Makefile.com	2014-03-02 23:23:10.729056700 +0400
++++ b/usr/src/cmd/sgs/ld/Makefile.com	2014-03-02 23:24:46.289213769 +0400
 @@ -34,7 +34,6 @@
  OBJS =		$(BLTOBJ) $(COMOBJS)
  .PARALLEL:	$(OBJS)
@@ -12,10 +12,10 @@ Index: libc/usr/src/cmd/sgs/ld/Makefile.com
  MAPOPTS =	$(MAPFILES:%=-M%)
  
  LDFLAGS +=	$(VERSREF) $(CC_USE_PROTO) $(MAPOPTS) $(VAR_LD_LLDFLAGS)
-Index: libc/usr/src/cmd/Makefile.cmd
+Index: b/usr/src/cmd/Makefile.cmd
 ===================================================================
---- libc.orig/usr/src/cmd/Makefile.cmd	2013-11-24 17:01:26.778901330 +0400
-+++ libc/usr/src/cmd/Makefile.cmd	2013-11-24 17:01:48.315898673 +0400
+--- a/usr/src/cmd/Makefile.cmd	2014-03-02 23:19:27.258663145 +0400
++++ b/usr/src/cmd/Makefile.cmd	2014-03-02 23:24:46.291538360 +0400
 @@ -502,3 +502,10 @@
  # This flag is for programs which should not build a 32-bit binary
  sparc_64ONLY= $(POUND_SIGN)
@@ -27,10 +27,10 @@ Index: libc/usr/src/cmd/Makefile.cmd
 +MAPFILE.PGA=
 +MAPFILE.NED=
 +
-Index: libc/usr/src/cmd/sgs/lddstub/i386/Makefile
+Index: b/usr/src/cmd/sgs/lddstub/i386/Makefile
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/lddstub/i386/Makefile	2013-11-24 17:01:36.995916537 +0400
-+++ libc/usr/src/cmd/sgs/lddstub/i386/Makefile	2013-11-24 17:01:48.318093091 +0400
+--- a/usr/src/cmd/sgs/lddstub/i386/Makefile	2014-03-02 23:22:25.404260135 +0400
++++ b/usr/src/cmd/sgs/lddstub/i386/Makefile	2014-03-02 23:24:46.293425850 +0400
 @@ -29,6 +29,8 @@
  
  .KEEP_STATE:
@@ -40,10 +40,10 @@ Index: libc/usr/src/cmd/sgs/lddstub/i386/Makefile
  install: all .WAIT $(ROOT)/$(DEB_USRLIBDIR_32)/$(PROG)
  $(ROOT)/$(DEB_USRLIBDIR_32)/$(PROG): $(PROG)
  	$(INS.file)
-Index: libc/usr/src/cmd/sgs/lddstub/Makefile.com
+Index: b/usr/src/cmd/sgs/lddstub/Makefile.com
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/lddstub/Makefile.com	2013-11-24 17:01:36.990933650 +0400
-+++ libc/usr/src/cmd/sgs/lddstub/Makefile.com	2013-11-24 17:03:52.162870211 +0400
+--- a/usr/src/cmd/sgs/lddstub/Makefile.com	2014-03-02 23:22:25.399941117 +0400
++++ b/usr/src/cmd/sgs/lddstub/Makefile.com	2014-03-02 23:24:46.294716814 +0400
 @@ -36,5 +36,6 @@
  # As of Solaris 9 the kernel accepts $ORIGIN within the interpreter field.
  
diff --git a/libc/debian/patches/cc-and-as-disagree.patch b/libc/debian/patches/cc-and-as-disagree.patch
index 829ff66..092e02a 100644
--- a/libc/debian/patches/cc-and-as-disagree.patch
+++ b/libc/debian/patches/cc-and-as-disagree.patch
@@ -4,9 +4,9 @@ Description: Use CFLAGS for .c -> .s translation.
 
 Index: b/usr/src/lib/libc/i386/Makefile.com
 ===================================================================
---- a/usr/src/lib/libc/i386/Makefile.com	2012-09-30 22:01:57.394396788 +0400
-+++ b/usr/src/lib/libc/i386/Makefile.com	2012-09-30 22:04:17.501788889 +0400
-@@ -1247,7 +1247,7 @@
+--- a/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:20:40.128869045 +0400
++++ b/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:20:51.062923175 +0400
+@@ -1252,7 +1252,7 @@
  	$(POST_PROCESS_A)
  
  $(LIBCBASE)/crt/_rtbootld.s: $(LIBCBASE)/crt/_rtboot.s $(LIBCBASE)/crt/_rtld.c
diff --git a/libc/debian/patches/crypt-multiarch.patch b/libc/debian/patches/crypt-multiarch.patch
index 77e4765..595ac26 100644
--- a/libc/debian/patches/crypt-multiarch.patch
+++ b/libc/debian/patches/crypt-multiarch.patch
@@ -1,8 +1,8 @@
 Description: Put crypto modules into multiarch dir
 Index: b/usr/src/lib/libc/port/gen/crypt.c
 ===================================================================
---- a/usr/src/lib/libc/port/gen/crypt.c	2012-09-30 22:01:55.272179040 +0400
-+++ b/usr/src/lib/libc/port/gen/crypt.c	2012-09-30 22:04:24.455038538 +0400
+--- a/usr/src/lib/libc/port/gen/crypt.c	2014-03-02 23:20:31.442120920 +0400
++++ b/usr/src/lib/libc/port/gen/crypt.c	2014-03-02 23:21:18.676987375 +0400
 @@ -61,13 +61,10 @@
  
  #define	CRYPT_CONFLINELENGTH	1024
@@ -44,8 +44,8 @@ Index: b/usr/src/lib/libc/port/gen/crypt.c
  	return (ret);
 Index: b/usr/src/lib/libc/Makefile.targ
 ===================================================================
---- a/usr/src/lib/libc/Makefile.targ	2012-09-30 22:04:22.662320295 +0400
-+++ b/usr/src/lib/libc/Makefile.targ	2012-09-30 22:04:24.455373970 +0400
+--- a/usr/src/lib/libc/Makefile.targ	2014-03-02 23:21:11.097475644 +0400
++++ b/usr/src/lib/libc/Makefile.targ	2014-03-02 23:21:18.678755158 +0400
 @@ -294,3 +294,10 @@
  	$(POST_PROCESS_O)
  
@@ -59,8 +59,8 @@ Index: b/usr/src/lib/libc/Makefile.targ
 +CFLAGS64 += $(CFLAGS_DEB_CRYPT)
 Index: b/usr/src/lib/crypt_modules/Makefile.crypt_modules
 ===================================================================
---- a/usr/src/lib/crypt_modules/Makefile.crypt_modules	2012-09-30 22:01:55.272091272 +0400
-+++ b/usr/src/lib/crypt_modules/Makefile.crypt_modules	2012-09-30 22:04:24.455740216 +0400
+--- a/usr/src/lib/crypt_modules/Makefile.crypt_modules	2014-03-02 23:20:31.442284735 +0400
++++ b/usr/src/lib/crypt_modules/Makefile.crypt_modules	2014-03-02 23:21:18.680520598 +0400
 @@ -34,7 +34,7 @@
  CFLAGS		+= $(CCVERBOSE)
  CPPFLAGS	+= -D_REENTRANT
diff --git a/libc/debian/patches/define-getdomainname.patch b/libc/debian/patches/define-getdomainname.patch
index c4a868a..b2b2f7f 100644
--- a/libc/debian/patches/define-getdomainname.patch
+++ b/libc/debian/patches/define-getdomainname.patch
@@ -1,8 +1,8 @@
-Index: libc/usr/src/head/unistd.h
+Index: b/usr/src/head/unistd.h
 ===================================================================
---- libc.orig/usr/src/head/unistd.h	2014-02-12 21:17:45.467869102 +0400
-+++ libc/usr/src/head/unistd.h	2014-02-15 18:07:43.032509874 +0400
-@@ -1033,6 +1033,13 @@
+--- a/usr/src/head/unistd.h	2014-03-02 23:24:59.607324620 +0400
++++ b/usr/src/head/unistd.h	2014-03-02 23:25:01.891531913 +0400
+@@ -1133,6 +1133,13 @@
  extern char **environ;
  #endif
  
diff --git a/libc/debian/patches/dyson-libc-add-gnu-error.patch b/libc/debian/patches/dyson-libc-add-gnu-error.patch
index afc4f36..5cb38cd 100644
--- a/libc/debian/patches/dyson-libc-add-gnu-error.patch
+++ b/libc/debian/patches/dyson-libc-add-gnu-error.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/head/Makefile
+Index: b/usr/src/head/Makefile
 ===================================================================
---- libc.orig/usr/src/head/Makefile	2013-05-31 14:49:42.629764477 +0400
-+++ libc/usr/src/head/Makefile	2013-05-31 14:50:31.668848130 +0400
+--- a/usr/src/head/Makefile	2014-03-02 23:20:48.806778994 +0400
++++ b/usr/src/head/Makefile	2014-03-02 23:23:22.193985993 +0400
 @@ -62,6 +62,7 @@
  	elf.h		\
  	err.h		\
@@ -10,10 +10,10 @@ Index: libc/usr/src/head/Makefile
  	euc.h		\
  	exacct.h	\
  	exacct_impl.h	\
-Index: libc/usr/src/head/error.h
+Index: b/usr/src/head/error.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/head/error.h	2013-06-07 00:34:21.490965476 +0400
++++ b/usr/src/head/error.h	2014-03-02 23:23:22.195657123 +0400
 @@ -0,0 +1,44 @@
 +/*
 +Copyright: 2013, Igor Pashev <pashev.igor@gmail.com>
@@ -59,11 +59,11 @@ Index: libc/usr/src/head/error.h
 +
 +#endif /* _ERROR_H */
 +
-Index: libc/usr/src/lib/libc/amd64/Makefile
+Index: b/usr/src/lib/libc/amd64/Makefile
 ===================================================================
---- libc.orig/usr/src/lib/libc/amd64/Makefile	2013-05-31 14:50:25.252933321 +0400
-+++ libc/usr/src/lib/libc/amd64/Makefile	2013-06-07 00:33:08.413249251 +0400
-@@ -107,6 +107,7 @@
+--- a/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:23:14.075980473 +0400
++++ b/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:23:22.199577360 +0400
+@@ -109,6 +109,7 @@
  	cuexit.o		\
  	ecvt.o			\
  	errlst.o		\
@@ -71,11 +71,11 @@ Index: libc/usr/src/lib/libc/amd64/Makefile
  	amd64_data.o		\
  	ldivide.o		\
  	lock.o			\
-Index: libc/usr/src/lib/libc/i386/Makefile.com
+Index: b/usr/src/lib/libc/i386/Makefile.com
 ===================================================================
---- libc.orig/usr/src/lib/libc/i386/Makefile.com	2013-05-31 14:50:25.255958301 +0400
-+++ libc/usr/src/lib/libc/i386/Makefile.com	2013-06-07 00:33:08.413952984 +0400
-@@ -114,6 +114,7 @@
+--- a/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:23:14.078098711 +0400
++++ b/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:23:22.203374092 +0400
+@@ -116,6 +116,7 @@
  	cuexit.o		\
  	ecvt.o			\
  	errlst.o		\
@@ -83,10 +83,10 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com
  	i386_data.o		\
  	ladd.o			\
  	ldivide.o		\
-Index: libc/usr/src/lib/libc/port/gen/error.c
+Index: b/usr/src/lib/libc/port/gen/error.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/lib/libc/port/gen/error.c	2013-05-31 14:50:31.691920962 +0400
++++ b/usr/src/lib/libc/port/gen/error.c	2014-03-02 23:23:22.205582658 +0400
 @@ -0,0 +1,94 @@
 +/*
 +Copyright: 2013, Igor Pashev <pashev.igor@gmail.com>
@@ -182,11 +182,11 @@ Index: libc/usr/src/lib/libc/port/gen/error.c
 +    va_end(ap);
 +}
 +
-Index: libc/usr/src/lib/libc/port/mapfile-vers
+Index: b/usr/src/lib/libc/port/mapfile-vers
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/mapfile-vers	2013-05-31 14:50:25.283963526 +0400
-+++ libc/usr/src/lib/libc/port/mapfile-vers	2013-06-07 00:33:06.949727706 +0400
-@@ -92,7 +92,14 @@
+--- a/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:23:14.083377278 +0400
++++ b/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:23:22.209430365 +0400
+@@ -127,7 +127,14 @@
  
  SYMBOL_VERSION DYSON_1 {
      global:
@@ -201,10 +201,10 @@ Index: libc/usr/src/lib/libc/port/mapfile-vers
  } ILLUMOS_0.3;
  
  SYMBOL_VERSION ILLUMOS_0.3 {	# Illumos additions
-Index: libc/usr/src/lib/libc/port/gen/err.c
+Index: b/usr/src/lib/libc/port/gen/err.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/gen/err.c	2012-10-08 04:25:38.000000000 +0400
-+++ libc/usr/src/lib/libc/port/gen/err.c	2013-05-31 14:50:31.698142712 +0400
+--- a/usr/src/lib/libc/port/gen/err.c	2014-03-02 23:19:56.936933530 +0400
++++ b/usr/src/lib/libc/port/gen/err.c	2014-03-02 23:23:22.211896332 +0400
 @@ -40,6 +40,8 @@
  /* Function exit/warning functions and global variables. */
  
@@ -224,10 +224,10 @@ Index: libc/usr/src/lib/libc/port/gen/err.c
  }
  
  /* called only from libc_init() */
-Index: libc/usr/src/head/errno.h
+Index: b/usr/src/head/errno.h
 ===================================================================
---- libc.orig/usr/src/head/errno.h	2012-10-08 04:25:37.000000000 +0400
-+++ libc/usr/src/head/errno.h	2013-05-31 14:50:31.699836563 +0400
+--- a/usr/src/head/errno.h	2014-03-02 23:19:56.936758560 +0400
++++ b/usr/src/head/errno.h	2014-03-02 23:23:22.213511286 +0400
 @@ -44,6 +44,11 @@
  extern "C" {
  #endif
diff --git a/libc/debian/patches/fnmatch-FNM_CASEFOLD.patch b/libc/debian/patches/fnmatch-FNM_CASEFOLD.patch
index 39d10aa..de511f9 100644
--- a/libc/debian/patches/fnmatch-FNM_CASEFOLD.patch
+++ b/libc/debian/patches/fnmatch-FNM_CASEFOLD.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/head/fnmatch.h
+Index: b/usr/src/head/fnmatch.h
 ===================================================================
---- libc.orig/usr/src/head/fnmatch.h	2012-10-08 04:25:37.000000000 +0400
-+++ libc/usr/src/head/fnmatch.h	2014-02-02 13:01:58.244465773 +0400
+--- a/usr/src/head/fnmatch.h	2014-03-02 23:19:26.681381317 +0400
++++ b/usr/src/head/fnmatch.h	2014-03-02 23:24:49.254131531 +0400
 @@ -38,6 +38,7 @@
  #define	FNM_PERIOD	0x04	/* Leading period in string must be exactly */
  				/* matched by period in pattern	*/
diff --git a/libc/debian/patches/fork1.patch b/libc/debian/patches/fork1.patch
index 309d34f..4441793 100644
--- a/libc/debian/patches/fork1.patch
+++ b/libc/debian/patches/fork1.patch
@@ -2,9 +2,9 @@ Description: cc1: error: '_fork1' aliased to external symbol 'fork1'
  'fork1' aliased to 'fork', so make '_fork1' aliased to 'fork'
 Index: b/usr/src/lib/libc/port/threads/scalls.c
 ===================================================================
---- a/usr/src/lib/libc/port/threads/scalls.c	2012-09-30 22:01:57.036814575 +0400
-+++ b/usr/src/lib/libc/port/threads/scalls.c	2012-09-30 22:04:18.839897793 +0400
-@@ -79,7 +79,7 @@
+--- a/usr/src/lib/libc/port/threads/scalls.c	2014-03-02 23:20:38.454214474 +0400
++++ b/usr/src/lib/libc/port/threads/scalls.c	2014-03-02 23:20:57.071297191 +0400
+@@ -81,7 +81,7 @@
  /*
   * These are SUNWprivate, but they are being used by Sun Studio libcollector.
   */
diff --git a/libc/debian/patches/gas-cpp-string-concat.patch b/libc/debian/patches/gas-cpp-string-concat.patch
index 7fc93ea..6262e76 100644
--- a/libc/debian/patches/gas-cpp-string-concat.patch
+++ b/libc/debian/patches/gas-cpp-string-concat.patch
@@ -1,7 +1,7 @@
 Index: b/usr/src/lib/libc/i386/inc/SYS.h
 ===================================================================
---- a/usr/src/lib/libc/i386/inc/SYS.h	2012-09-30 22:01:57.162242716 +0400
-+++ b/usr/src/lib/libc/i386/inc/SYS.h	2012-09-30 22:04:18.029233723 +0400
+--- a/usr/src/lib/libc/i386/inc/SYS.h	2014-03-02 23:20:39.005103547 +0400
++++ b/usr/src/lib/libc/i386/inc/SYS.h	2014-03-02 23:20:53.360593724 +0400
 @@ -64,7 +64,7 @@
  
  #define	__SYSCALLINT(name)		\
@@ -81,8 +81,8 @@ Index: b/usr/src/lib/libc/i386/inc/SYS.h
   * SYSCALL_NOERROR provides the most common system call sequence for those
 Index: b/usr/src/lib/libc/amd64/inc/SYS.h
 ===================================================================
---- a/usr/src/lib/libc/amd64/inc/SYS.h	2012-09-30 22:01:57.162112785 +0400
-+++ b/usr/src/lib/libc/amd64/inc/SYS.h	2012-09-30 22:04:18.029722260 +0400
+--- a/usr/src/lib/libc/amd64/inc/SYS.h	2014-03-02 23:20:39.005083291 +0400
++++ b/usr/src/lib/libc/amd64/inc/SYS.h	2014-03-02 23:20:53.362455251 +0400
 @@ -54,7 +54,7 @@
  #define	__SYSCALL(name)			\
  	movq	%rcx, %r10;		\
@@ -103,8 +103,8 @@ Index: b/usr/src/lib/libc/amd64/inc/SYS.h
  /*
 Index: b/usr/src/lib/libc/amd64/gen/memcmp.s
 ===================================================================
---- a/usr/src/lib/libc/amd64/gen/memcmp.s	2012-09-30 22:01:57.162218724 +0400
-+++ b/usr/src/lib/libc/amd64/gen/memcmp.s	2012-09-30 22:04:18.030203051 +0400
+--- a/usr/src/lib/libc/amd64/gen/memcmp.s	2014-03-02 23:20:39.004963537 +0400
++++ b/usr/src/lib/libc/amd64/gen/memcmp.s	2014-03-02 23:20:53.364600040 +0400
 @@ -54,7 +54,7 @@
  #include "SYS.h"
  #include "cache.h"
@@ -116,8 +116,8 @@ Index: b/usr/src/lib/libc/amd64/gen/memcmp.s
  
 Index: b/usr/src/lib/libc/amd64/gen/memcpy.s
 ===================================================================
---- a/usr/src/lib/libc/amd64/gen/memcpy.s	2012-09-30 22:01:57.162168084 +0400
-+++ b/usr/src/lib/libc/amd64/gen/memcpy.s	2012-09-30 22:04:18.031273217 +0400
+--- a/usr/src/lib/libc/amd64/gen/memcpy.s	2014-03-02 23:20:39.005063631 +0400
++++ b/usr/src/lib/libc/amd64/gen/memcpy.s	2014-03-02 23:20:53.368211345 +0400
 @@ -44,7 +44,7 @@
  #include "cache.h"
  #include "proc64_id.h"
@@ -129,8 +129,8 @@ Index: b/usr/src/lib/libc/amd64/gen/memcpy.s
   * memcpy algorithm overview:
 Index: b/usr/src/lib/libc/amd64/gen/memset.s
 ===================================================================
---- a/usr/src/lib/libc/amd64/gen/memset.s	2012-09-30 22:01:57.162195235 +0400
-+++ b/usr/src/lib/libc/amd64/gen/memset.s	2012-09-30 22:04:18.032628337 +0400
+--- a/usr/src/lib/libc/amd64/gen/memset.s	2014-03-02 23:20:39.004985776 +0400
++++ b/usr/src/lib/libc/amd64/gen/memset.s	2014-03-02 23:20:53.370329218 +0400
 @@ -42,7 +42,7 @@
  #include "cache.h"
  #include "proc64_id.h"
@@ -142,8 +142,8 @@ Index: b/usr/src/lib/libc/amd64/gen/memset.s
   * memset algorithm overview:
 Index: b/usr/src/lib/libc/amd64/gen/strcmp.s
 ===================================================================
---- a/usr/src/lib/libc/amd64/gen/strcmp.s	2012-09-30 22:01:57.162231700 +0400
-+++ b/usr/src/lib/libc/amd64/gen/strcmp.s	2012-09-30 22:04:18.033273921 +0400
+--- a/usr/src/lib/libc/amd64/gen/strcmp.s	2014-03-02 23:20:39.004892940 +0400
++++ b/usr/src/lib/libc/amd64/gen/strcmp.s	2014-03-02 23:20:53.372523959 +0400
 @@ -31,7 +31,7 @@
  #include "SYS.h"
  #include "proc64_id.h"
@@ -155,8 +155,8 @@ Index: b/usr/src/lib/libc/amd64/gen/strcmp.s
  	/*
 Index: b/usr/src/lib/libc/amd64/gen/strcpy.s
 ===================================================================
---- a/usr/src/lib/libc/amd64/gen/strcpy.s	2012-09-30 22:01:57.162207265 +0400
-+++ b/usr/src/lib/libc/amd64/gen/strcpy.s	2012-09-30 22:04:18.034113702 +0400
+--- a/usr/src/lib/libc/amd64/gen/strcpy.s	2014-03-02 23:20:39.005006055 +0400
++++ b/usr/src/lib/libc/amd64/gen/strcpy.s	2014-03-02 23:20:53.374612503 +0400
 @@ -30,7 +30,7 @@
  #include "SYS.h"
  #include "proc64_id.h"
@@ -168,8 +168,8 @@ Index: b/usr/src/lib/libc/amd64/gen/strcpy.s
  	ENTRY(strncpy)
 Index: b/usr/src/lib/libc/amd64/gen/strlen.s
 ===================================================================
---- a/usr/src/lib/libc/amd64/gen/strlen.s	2012-09-30 22:01:57.162183925 +0400
-+++ b/usr/src/lib/libc/amd64/gen/strlen.s	2012-09-30 22:04:18.034426792 +0400
+--- a/usr/src/lib/libc/amd64/gen/strlen.s	2014-03-02 23:20:39.005042620 +0400
++++ b/usr/src/lib/libc/amd64/gen/strlen.s	2014-03-02 23:20:53.376697088 +0400
 @@ -31,7 +31,7 @@
  #include "SYS.h"
  #include "proc64_id.h"
diff --git a/libc/debian/patches/genassym-use-gnuld.patch b/libc/debian/patches/genassym-use-gnuld.patch
index a68bc8b..5f6da3d 100644
--- a/libc/debian/patches/genassym-use-gnuld.patch
+++ b/libc/debian/patches/genassym-use-gnuld.patch
@@ -1,10 +1,10 @@
 Description: illumos ld (sunld) complains about R_AMD64_GOT32 in crt1.o:
  section [2].rela.text: relocation not currently supported
-Index: libc/usr/src/lib/libc/amd64/Makefile
+Index: b/usr/src/lib/libc/amd64/Makefile
 ===================================================================
---- libc.orig/usr/src/lib/libc/amd64/Makefile	2013-11-23 06:31:48.725952891 +0400
-+++ libc/usr/src/lib/libc/amd64/Makefile	2013-11-23 16:41:17.869360041 +0400
-@@ -1214,7 +1214,7 @@
+--- a/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:24:22.270360035 +0400
++++ b/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:24:43.814945646 +0400
+@@ -1219,7 +1219,7 @@
  GENASSYM_C = genassym.c
  
  genassym: $(GENASSYM_C)
@@ -13,11 +13,11 @@ Index: libc/usr/src/lib/libc/amd64/Makefile
  		-o $@ $(GENASSYM_C)
  
  OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in
-Index: libc/usr/src/lib/libc/i386/Makefile.com
+Index: b/usr/src/lib/libc/i386/Makefile.com
 ===================================================================
---- libc.orig/usr/src/lib/libc/i386/Makefile.com	2013-11-23 06:31:48.728670196 +0400
-+++ libc/usr/src/lib/libc/i386/Makefile.com	2013-11-23 16:40:51.292635985 +0400
-@@ -1286,7 +1286,7 @@
+--- a/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:24:22.272594604 +0400
++++ b/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:24:43.817337941 +0400
+@@ -1291,7 +1291,7 @@
  GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c
  
  genassym: $(GENASSYM_C)
diff --git a/libc/debian/patches/getconf-no-xpg.patch b/libc/debian/patches/getconf-no-xpg.patch
index fced5ca..2ccfd95 100644
--- a/libc/debian/patches/getconf-no-xpg.patch
+++ b/libc/debian/patches/getconf-no-xpg.patch
@@ -1,7 +1,7 @@
 Index: b/usr/src/cmd/getconf/Makefile
 ===================================================================
---- a/usr/src/cmd/getconf/Makefile	2012-09-30 22:01:52.352358148 +0400
-+++ b/usr/src/cmd/getconf/Makefile	2012-09-30 22:04:35.946028080 +0400
+--- a/usr/src/cmd/getconf/Makefile	2014-03-02 23:20:18.295525098 +0400
++++ b/usr/src/cmd/getconf/Makefile	2014-03-02 23:21:59.259195027 +0400
 @@ -73,7 +73,7 @@
  
  .KEEP_STATE:
diff --git a/libc/debian/patches/getent-avoid-libproject.patch b/libc/debian/patches/getent-avoid-libproject.patch
index 537c33c..ef0ea64 100644
--- a/libc/debian/patches/getent-avoid-libproject.patch
+++ b/libc/debian/patches/getent-avoid-libproject.patch
@@ -1,7 +1,7 @@
 Index: b/usr/src/cmd/getent/Makefile
 ===================================================================
---- a/usr/src/cmd/getent/Makefile	2012-09-30 22:01:52.175966659 +0400
-+++ b/usr/src/cmd/getent/Makefile	2012-09-30 22:04:36.484262935 +0400
+--- a/usr/src/cmd/getent/Makefile	2014-03-02 23:20:17.699274066 +0400
++++ b/usr/src/cmd/getent/Makefile	2014-03-02 23:22:01.564110989 +0400
 @@ -46,7 +46,7 @@
  
  SRCS=	$(OBJECTS:.o=.c)
@@ -13,8 +13,8 @@ Index: b/usr/src/cmd/getent/Makefile
  # for message catalog
 Index: b/usr/src/cmd/getent/dogetproject.c
 ===================================================================
---- a/usr/src/cmd/getent/dogetproject.c	2012-09-30 22:01:52.175920550 +0400
-+++ b/usr/src/cmd/getent/dogetproject.c	2012-09-30 22:04:36.484772353 +0400
+--- a/usr/src/cmd/getent/dogetproject.c	2014-03-02 23:20:17.699466732 +0400
++++ b/usr/src/cmd/getent/dogetproject.c	2014-03-02 23:22:01.565908668 +0400
 @@ -29,9 +29,226 @@
  #include <stdio.h>
  #include <grp.h>
diff --git a/libc/debian/patches/gnu-make-quirks.patch b/libc/debian/patches/gnu-make-quirks.patch
index df37424..bc1da17 100644
--- a/libc/debian/patches/gnu-make-quirks.patch
+++ b/libc/debian/patches/gnu-make-quirks.patch
@@ -6,8 +6,8 @@ Description: Fixes for GNU make.
  
 Index: b/usr/src/lib/libc/Makefile.targ
 ===================================================================
---- a/usr/src/lib/libc/Makefile.targ	2012-09-30 22:04:19.400419050 +0400
-+++ b/usr/src/lib/libc/Makefile.targ	2012-09-30 22:04:22.662320295 +0400
+--- a/usr/src/lib/libc/Makefile.targ	2014-03-02 23:20:59.385270147 +0400
++++ b/usr/src/lib/libc/Makefile.targ	2014-03-02 23:21:11.097475644 +0400
 @@ -53,10 +53,6 @@
  	$(BUILD.s)
  	$(POST_PROCESS_O)
@@ -45,8 +45,8 @@ Index: b/usr/src/lib/libc/Makefile.targ
  
 Index: b/usr/src/Makefile.msg.targ
 ===================================================================
---- a/usr/src/Makefile.msg.targ	2012-09-30 22:01:55.819692529 +0400
-+++ b/usr/src/Makefile.msg.targ	2012-09-30 22:04:22.663327619 +0400
+--- a/usr/src/Makefile.msg.targ	2014-03-02 23:20:33.768178253 +0400
++++ b/usr/src/Makefile.msg.targ	2014-03-02 23:21:11.099559553 +0400
 @@ -33,7 +33,7 @@
  
  .PARALLEL:	$(POFILES) $(MSGFILES)
@@ -58,9 +58,9 @@ Index: b/usr/src/Makefile.msg.targ
  $(MSGDOMAINPOFILE): $(MSGDOMAIN) $(POFILE)
 Index: b/usr/src/lib/libc/i386/Makefile.com
 ===================================================================
---- a/usr/src/lib/libc/i386/Makefile.com	2012-09-30 22:04:17.501788889 +0400
-+++ b/usr/src/lib/libc/i386/Makefile.com	2012-09-30 22:04:22.664478667 +0400
-@@ -1289,5 +1289,9 @@
+--- a/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:20:51.062923175 +0400
++++ b/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:21:11.102603112 +0400
+@@ -1294,5 +1294,9 @@
  	cd $(LIBCDIR)/port/gen; pwd; $(AWK) -f errlist.awk < errlist
  
  pics/errlst.o: $(LIBCDIR)/port/gen/errlst.c
@@ -72,9 +72,9 @@ Index: b/usr/src/lib/libc/i386/Makefile.com
 +	$(POST_PROCESS_O)
 Index: b/usr/src/lib/libc/amd64/Makefile
 ===================================================================
---- a/usr/src/lib/libc/amd64/Makefile	2012-09-30 22:01:55.819856376 +0400
-+++ b/usr/src/lib/libc/amd64/Makefile	2012-09-30 22:04:22.665085791 +0400
-@@ -1217,5 +1217,9 @@
+--- a/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:20:33.768322967 +0400
++++ b/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:21:11.104864140 +0400
+@@ -1222,5 +1222,9 @@
  	cd $(LIBCDIR)/port/gen; pwd; $(AWK) -f errlist.awk < errlist
  
  pics/errlst.o: $(LIBCDIR)/port/gen/errlst.c
diff --git a/libc/debian/patches/headers-limits.h-name-max.patch b/libc/debian/patches/headers-limits.h-name-max.patch
index 3e23b8c..55c7022 100644
--- a/libc/debian/patches/headers-limits.h-name-max.patch
+++ b/libc/debian/patches/headers-limits.h-name-max.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/head/limits.h
+Index: b/usr/src/head/limits.h
 ===================================================================
---- libc.orig/usr/src/head/limits.h	2012-09-30 20:41:17.000000000 +0400
-+++ libc/usr/src/head/limits.h	2012-10-07 23:38:40.104532063 +0400
+--- a/usr/src/head/limits.h	2014-03-02 23:20:09.011231830 +0400
++++ b/usr/src/head/limits.h	2014-03-02 23:22:30.921429352 +0400
 @@ -262,6 +262,8 @@
   * #define	NAME_MAX	14
   */
@@ -11,15 +11,3 @@ Index: libc/usr/src/head/limits.h
  #define	CHILD_MAX	25	/* max # of processes per user id */
  #ifndef OPEN_MAX
  #define	OPEN_MAX	256	/* max # of files a process can have open */
-Index: libc/usr/src/lib/libc/port/regex/glob.c
-===================================================================
---- libc.orig/usr/src/lib/libc/port/regex/glob.c	2012-09-30 20:41:22.000000000 +0400
-+++ libc/usr/src/lib/libc/port/regex/glob.c	2012-10-07 23:44:43.948613017 +0400
-@@ -64,6 +64,7 @@
- 
- #define	INITIAL	8		/* initial pathv allocation */
- #define	NULLCPP	((char **)0)	/* Null char ** */
-+#undef NAME_MAX
- #define	NAME_MAX	1024	/* something large */
- 
- static int	globit(size_t, const char *, glob_t *, int,
diff --git a/libc/debian/patches/illumos-195-librpcsvc.patch b/libc/debian/patches/illumos-195-librpcsvc.patch
deleted file mode 100644
index 4ba45d8..0000000
--- a/libc/debian/patches/illumos-195-librpcsvc.patch
+++ /dev/null
@@ -1,517 +0,0 @@
-Index: libc/usr/src/lib/librpcsvc/common/mapfile-vers
-===================================================================
---- libc.orig/usr/src/lib/librpcsvc/common/mapfile-vers	2012-10-08 04:25:42.000000000 +0400
-+++ libc/usr/src/lib/librpcsvc/common/mapfile-vers	2013-09-29 11:23:39.794843019 +0400
-@@ -76,8 +76,6 @@
- 	xdr_fhandle;
- 	xdr_fhandle3;
- 	xdr_fhstatus;
--	xdr_fsh4_access;
--	xdr_fsh4_mode;
- 	xdr_fsh_access;
- 	xdr_fsh_mode;
- 	xdr_groupnode;
-@@ -127,17 +125,17 @@
- 	xdr_ppathcnf;
- 	xdr_reg1args;
- 	xdr_reg1res;
--	xdr_res;
- 	xdr_rstat_timeval;
- 	xdr_rusers_utmp;
- 	xdr_sm_name;
-+	xdr_sm_res;
- 	xdr_sm_stat;
- 	xdr_sm_stat_res;
-+	xdr_sm_status;
- 	xdr_sprayarr;
- 	xdr_spraycumul;
- 	xdr_spraytimeval;
- 	xdr_stat_chge;
--	xdr_status;
- 	xdr_timeval;
- 	xdr_uint32;
- 	xdr_uint64;
-Index: libc/usr/src/head/rpcsvc/nlm_prot.x
-===================================================================
---- libc.orig/usr/src/head/rpcsvc/nlm_prot.x	2013-09-27 23:24:47.105928776 +0400
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
-@@ -1,452 +0,0 @@
--/*
-- * CDDL HEADER START
-- *
-- * The contents of this file are subject to the terms of the
-- * Common Development and Distribution License, Version 1.0 only
-- * (the "License").  You may not use this file except in compliance
-- * with the License.
-- *
-- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-- * or http://www.opensolaris.org/os/licensing.
-- * See the License for the specific language governing permissions
-- * and limitations under the License.
-- *
-- * When distributing Covered Code, include this CDDL HEADER in each
-- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-- * If applicable, add the following below this CDDL HEADER, with the
-- * fields enclosed by brackets "[]" replaced with your own identifying
-- * information: Portions Copyright [yyyy] [name of copyright owner]
-- *
-- * CDDL HEADER END
-- */
--/*
-- * Network lock manager protocol definition
-- * Copyright (C) 1986, 1992, 1993, 1997, 1999 by Sun Microsystems, Inc.
-- * All rights reserved.
-- *
-- * Protocol used between local lock manager and remote lock manager.
-- *
-- * There are currently 3 versions of the protocol in use.  Versions 1
-- * and 3 are used with NFS version 2.  Version 4 is used with NFS
-- * version 3.
-- *
-- * (Note: there is also a version 2, but it defines an orthogonal set of
-- * procedures that the status monitor uses to notify the lock manager of
-- * changes in monitored systems.)
-- */
--
--%#pragma ident	"%Z%%M%	%I%	%E% SMI"
--
--#if RPC_HDR
--%
--%#include <rpc/rpc_sztypes.h>
--%
--#endif
--
--#ifdef RPC_HDR
--%#define LM_MAXSTRLEN	1024
--%#define LM_MAXNAMELEN	(LM_MAXSTRLEN + 1)
--#endif
--
--/*
-- * Types for versions 1 and 3.
-- */
--
--/*
-- * Status of a call to the lock manager.  The lower case enums violate the
-- * current style guide, but we're stuck with 'em.
-- */
--
--enum nlm_stats {
--	nlm_granted = 0,
--	nlm_denied = 1,
--	nlm_denied_nolocks = 2,
--	nlm_blocked = 3,
--	nlm_denied_grace_period = 4,
--	nlm_deadlck = 5
--};
--
--/*
-- * The holder of a conflicting lock.
-- */
--
--struct nlm_holder {
--	bool exclusive;
--	int svid;
--	netobj oh;
--	unsigned l_offset;
--	unsigned l_len;
--};
--
--union nlm_testrply switch (nlm_stats stat) {
--	case nlm_denied:
--		struct nlm_holder holder;
--	default:
--		void;
--};
--
--struct nlm_stat {
--	nlm_stats stat;
--};
--
--struct nlm_res {
--	netobj cookie;
--	nlm_stat stat;
--};
--
--struct nlm_testres {
--	netobj cookie;
--	nlm_testrply stat;
--};
--
--struct nlm_lock {
--	string caller_name<LM_MAXSTRLEN>;
--	netobj fh;		/* identify a file */
--	netobj oh;		/* identify owner of a lock */
--	int svid;		/* generated from pid for svid */
--	unsigned l_offset;
--	unsigned l_len;
--};
--
--struct nlm_lockargs {
--	netobj cookie;
--	bool block;
--	bool exclusive;
--	struct nlm_lock alock;
--	bool reclaim;		/* used for recovering locks */
--	int state;		/* specify local status monitor state */
--};
--
--struct nlm_cancargs {
--	netobj cookie;
--	bool block;
--	bool exclusive;
--	struct nlm_lock alock;
--};
--
--struct nlm_testargs {
--	netobj cookie;
--	bool exclusive;
--	struct nlm_lock alock;
--};
--
--struct nlm_unlockargs {
--	netobj cookie;
--	struct nlm_lock alock;
--};
--
--#ifdef RPC_HDR
--%/*
--% * The following enums are actually bit encoded for efficient
--% * boolean algebra.... DON'T change them.....
--% * The mixed-case enums violate the present style guide, but we're
--% * stuck with 'em.
--% */
--#endif
--
--enum	fsh_mode {
--	fsm_DN  = 0,	/* deny none */
--	fsm_DR  = 1,	/* deny read */
--	fsm_DW  = 2,	/* deny write */
--	fsm_DRW = 3	/* deny read/write */
--};
--
--enum	fsh_access {
--	fsa_NONE = 0,	/* for completeness */
--	fsa_R    = 1,	/* read only */
--	fsa_W    = 2,	/* write only */
--	fsa_RW   = 3	/* read/write */
--};
--
--struct	nlm_share {
--	string caller_name<LM_MAXSTRLEN>;
--	netobj	fh;
--	netobj	oh;
--	fsh_mode	mode;
--	fsh_access	access;
--};
--
--struct	nlm_shareargs {
--	netobj	cookie;
--	nlm_share	share;
--	bool	reclaim;
--};
--
--struct	nlm_shareres {
--	netobj	cookie;
--	nlm_stats	stat;
--	int	sequence;
--};
--
--struct	nlm_notify {
--	string name<LM_MAXNAMELEN>;
--	int state;
--};
--
--/*
-- * Types for version 4.
-- *
-- * This revision is designed to work with NFS V3.  The main changes from
-- * NFS V2 to V3 that affect the NLM protocol are that all file offsets
-- * and sizes are now unsigned 64-bit ints, and file handles are now
-- * variable length.  In NLM V1 and V3, the fixed-length V2 file handle
-- * was encoded as a 'netobj', which is a count followed by the data
-- * bytes.  For NLM 4, the file handle is already a count followed by
-- * data bytes, so the handle is copied directly into the netobj, rather
-- * than being encoded with an additional byte count.
-- */
--
--/*
-- * Status of a call to the lock manager.
-- */
--
--enum nlm4_stats {
--	NLM4_GRANTED = 0,		/* lock was granted */
--	NLM4_DENIED = 1,		/* lock was not granted, usually */
--					/* due to conflicting lock */
--	NLM4_DENIED_NOLOCKS = 2,	/* not granted: out of resources */
--	NLM4_BLOCKED = 3,		/* not granted: expect callback */
--					/* when granted */
--	NLM4_DENIED_GRACE_PERIOD = 4,	/* not granted: server is */
--					/* reestablishing old locks */
--	NLM4_DEADLCK = 5,		/* not granted: deadlock detected */
--	NLM4_ROFS = 6,			/* not granted: read-only filesystem */
--	NLM4_STALE_FH = 7,		/* not granted: stale file handle */
--	NLM4_FBIG = 8,			/* not granted: offset or length */
--					/* too big */
--	NLM4_FAILED = 9			/* not granted: some other error */
--};
--
--/*
-- * The holder of a conflicting lock.
-- */
--
--struct nlm4_holder {
--	bool exclusive;
--	int32 svid;
--	netobj oh;
--	uint64 l_offset;
--	uint64 l_len;
--};
--
--union nlm4_testrply switch (nlm4_stats stat) {
--	case NLM4_DENIED:
--		struct nlm4_holder holder;
--	default:
--		void;
--};
--
--struct nlm4_stat {
--	nlm4_stats stat;
--};
--
--struct nlm4_res {
--	netobj cookie;
--	nlm4_stat stat;
--};
--
--struct nlm4_testres {
--	netobj cookie;
--	nlm4_testrply stat;
--};
--
--struct nlm4_lock {
--	string caller_name<LM_MAXSTRLEN>;
--	netobj fh;		/* identify a file */
--	netobj oh;		/* identify owner of a lock */
--	int32 svid;		/* generated from pid for svid */
--	uint64 l_offset;
--	uint64 l_len;
--};
--
--struct nlm4_lockargs {
--	netobj cookie;
--	bool block;
--	bool exclusive;
--	struct nlm4_lock alock;
--	bool reclaim;		/* used for recovering locks */
--	int32 state;		/* specify local status monitor state */
--};
--
--struct nlm4_cancargs {
--	netobj cookie;
--	bool block;
--	bool exclusive;
--	struct nlm4_lock alock;
--};
--
--struct nlm4_testargs {
--	netobj cookie;
--	bool exclusive;
--	struct nlm4_lock alock;
--};
--
--struct nlm4_unlockargs {
--	netobj cookie;
--	struct nlm4_lock alock;
--};
--
--#ifdef RPC_HDR
--%/*
--% * The following enums are actually bit encoded for efficient
--% * boolean algebra.... DON'T change them.....
--% */
--#endif
--
--enum	fsh4_mode {
--	FSM_DN  = 0,	/* deny none */
--	FSM_DR  = 1,	/* deny read */
--	FSM_DW  = 2,	/* deny write */
--	FSM_DRW = 3	/* deny read/write */
--};
--
--enum	fsh4_access {
--	FSA_NONE = 0,	/* for completeness */
--	FSA_R    = 1,	/* read only */
--	FSA_W    = 2,	/* write only */
--	FSA_RW   = 3	/* read/write */
--};
--
--struct	nlm4_share {
--	string caller_name<LM_MAXSTRLEN>;
--	netobj	fh;
--	netobj	oh;
--	fsh4_mode	mode;
--	fsh4_access	access;
--};
--
--struct	nlm4_shareargs {
--	netobj	cookie;
--	nlm4_share	share;
--	bool	reclaim;
--};
--
--struct	nlm4_shareres {
--	netobj	cookie;
--	nlm4_stats	stat;
--	int32	sequence;
--};
--
--struct	nlm4_notify {
--	string name<LM_MAXNAMELEN>;
--	int32 state;
--};
--
--/*
-- * Over-the-wire protocol used between the network lock managers
-- */
--
--program NLM_PROG {
--	version NLM_VERS {
--
--		nlm_testres
--			NLM_TEST(nlm_testargs) =		1;
--
--		nlm_res
--			NLM_LOCK(nlm_lockargs) =		2;
--
--		nlm_res
--			NLM_CANCEL(nlm_cancargs) =		3;
--
--		nlm_res
--			NLM_UNLOCK(nlm_unlockargs) =		4;
--		/*
--		 * remote lock manager call-back to grant lock
--		 */
--		nlm_res
--			NLM_GRANTED(nlm_testargs) =		5;
--
--		/*
--		 * message passing style of requesting lock
--		 */
--
--		void
--			NLM_TEST_MSG(nlm_testargs) =		6;
--		void
--			NLM_LOCK_MSG(nlm_lockargs) =		7;
--		void
--			NLM_CANCEL_MSG(nlm_cancargs) =		8;
--		void
--			NLM_UNLOCK_MSG(nlm_unlockargs) =	9;
--		void
--			NLM_GRANTED_MSG(nlm_testargs) =		10;
--		void
--			NLM_TEST_RES(nlm_testres) =		11;
--		void
--			NLM_LOCK_RES(nlm_res) =			12;
--		void
--			NLM_CANCEL_RES(nlm_res) =		13;
--		void
--			NLM_UNLOCK_RES(nlm_res) =		14;
--		void
--			NLM_GRANTED_RES(nlm_res) =		15;
--	} = 1;
--
--	version NLM_VERSX {
--		nlm_shareres
--			NLM_SHARE(nlm_shareargs) =		20;
--		nlm_shareres
--			NLM_UNSHARE(nlm_shareargs) =		21;
--		nlm_res
--			NLM_NM_LOCK(nlm_lockargs) =		22;
--		void
--			NLM_FREE_ALL(nlm_notify) =		23;
--	} = 3;
--
--	version NLM4_VERS {
--		void
--			NLMPROC4_NULL(void) =			0;
--		nlm4_testres
--			NLMPROC4_TEST(nlm4_testargs) =		1;
--		nlm4_res
--			NLMPROC4_LOCK(nlm4_lockargs) =		2;
--		nlm4_res
--			NLMPROC4_CANCEL(nlm4_cancargs) =	3;
--		nlm4_res
--			NLMPROC4_UNLOCK(nlm4_unlockargs) =	4;
--		/*
--		 * remote lock manager call-back to grant lock
--		 */
--		nlm4_res
--			NLMPROC4_GRANTED(nlm4_testargs) =	5;
--
--		/*
--		 * message passing style of requesting lock
--		 */
--
--		void
--			NLMPROC4_TEST_MSG(nlm4_testargs) =	6;
--		void
--			NLMPROC4_LOCK_MSG(nlm4_lockargs) =	7;
--		void
--			NLMPROC4_CANCEL_MSG(nlm4_cancargs) =	8;
--		void
--			NLMPROC4_UNLOCK_MSG(nlm4_unlockargs) =	9;
--		void
--			NLMPROC4_GRANTED_MSG(nlm4_testargs) =	10;
--		void
--			NLMPROC4_TEST_RES(nlm4_testres) =	11;
--		void
--			NLMPROC4_LOCK_RES(nlm4_res) =		12;
--		void
--			NLMPROC4_CANCEL_RES(nlm4_res) =		13;
--		void
--			NLMPROC4_UNLOCK_RES(nlm4_res) =		14;
--		void
--			NLMPROC4_GRANTED_RES(nlm4_res) =	15;
--
--		/*
--		 * DOS-style file sharing
--		 */
--
--		nlm4_shareres
--			NLMPROC4_SHARE(nlm4_shareargs) =	20;
--		nlm4_shareres
--			NLMPROC4_UNSHARE(nlm4_shareargs) =	21;
--		nlm4_res
--			NLMPROC4_NM_LOCK(nlm4_lockargs) =	22;
--		void
--			NLMPROC4_FREE_ALL(nlm4_notify) =	23;
--	} = 4;
--
--} = 100021;
-Index: libc/usr/src/head/Makefile
-===================================================================
---- libc.orig/usr/src/head/Makefile	2013-09-27 23:24:44.007200925 +0400
-+++ libc/usr/src/head/Makefile	2013-09-29 11:11:58.092873181 +0400
-@@ -266,7 +266,6 @@
- 	nfs_prot.h	\
- 	nfs4_prot.h	\
- 	nis.h		\
--	nlm_prot.h	\
- 	rex.h		\
- 	rquota.h	\
- 	rstat.h		\
-Index: libc/usr/src/lib/librpcsvc/Makefile
-===================================================================
---- libc.orig/usr/src/lib/librpcsvc/Makefile	2013-09-27 23:24:46.613037750 +0400
-+++ libc/usr/src/lib/librpcsvc/Makefile	2013-09-29 11:17:55.598127828 +0400
-@@ -97,8 +97,8 @@
- common/spray_xdr.c: $(PROTOCOL_DIR)/spray.x
- 	$(RPCGEN) -c $(PROTOCOL_DIR)/spray.x > $@
- 
--common/nlm_prot.c: $(PROTOCOL_DIR)/nlm_prot.x
--	$(RPCGEN) -c $(PROTOCOL_DIR)/nlm_prot.x > $@
-+common/nlm_prot.c: /usr/include/rpcsvc/nlm_prot.x
-+	$(RPCGEN) -c /usr/include/rpcsvc/nlm_prot.x > $@
- 
- common/mount_xdr.c: $(PROTOCOL_DIR)/mount.x
- 	$(RPCGEN) -c $(PROTOCOL_DIR)/mount.x > $@
diff --git a/libc/debian/patches/illumos-2252-gettext.patch b/libc/debian/patches/illumos-2252-gettext.patch
index 31aeeae..b1934a6 100644
--- a/libc/debian/patches/illumos-2252-gettext.patch
+++ b/libc/debian/patches/illumos-2252-gettext.patch
@@ -4,8 +4,8 @@ Description: gettext should search in several directories
 Bug: https://www.illumos.org/issues/2252
 Index: b/usr/src/lib/libc/port/i18n/gettext_util.c
 ===================================================================
---- a/usr/src/lib/libc/port/i18n/gettext_util.c	2012-09-30 22:01:56.561076827 +0400
-+++ b/usr/src/lib/libc/port/i18n/gettext_util.c	2012-09-30 22:04:20.006695081 +0400
+--- a/usr/src/lib/libc/port/i18n/gettext_util.c	2014-03-02 23:20:36.661916792 +0400
++++ b/usr/src/lib/libc/port/i18n/gettext_util.c	2014-03-02 23:21:02.037898031 +0400
 @@ -88,6 +88,8 @@
  {
  	char	*p, *q;
diff --git a/libc/debian/patches/illumos-2404-mmap.patch b/libc/debian/patches/illumos-2404-mmap.patch
index d324b3d..4e35323 100644
--- a/libc/debian/patches/illumos-2404-mmap.patch
+++ b/libc/debian/patches/illumos-2404-mmap.patch
@@ -5,8 +5,8 @@ Bug: https://www.illumos.org/issues/2404
 
 Index: b/usr/src/lib/libc/common/sys/mmap.s
 ===================================================================
---- a/usr/src/lib/libc/common/sys/mmap.s	2012-09-30 22:01:56.837992713 +0400
-+++ b/usr/src/lib/libc/common/sys/mmap.s	2012-09-30 22:04:19.399674119 +0400
+--- a/usr/src/lib/libc/common/sys/mmap.s	2014-03-02 23:20:37.823065299 +0400
++++ b/usr/src/lib/libc/common/sys/mmap.s	2014-03-02 23:20:59.382614847 +0400
 @@ -31,17 +31,11 @@
  
  #include <sys/asm_linkage.h>
@@ -53,7 +53,7 @@ Index: b/usr/src/lib/libc/common/sys/mmap.s
 Index: b/usr/src/lib/libc/common/sys/mmap64.s
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ b/usr/src/lib/libc/common/sys/mmap64.s	2012-09-30 22:04:19.400039358 +0400
++++ b/usr/src/lib/libc/common/sys/mmap64.s	2014-03-02 23:20:59.383765203 +0400
 @@ -0,0 +1,56 @@
 +/*
 + * CDDL HEADER START
@@ -113,8 +113,8 @@ Index: b/usr/src/lib/libc/common/sys/mmap64.s
 +
 Index: b/usr/src/lib/libc/Makefile.targ
 ===================================================================
---- a/usr/src/lib/libc/Makefile.targ	2012-09-30 22:01:56.837929047 +0400
-+++ b/usr/src/lib/libc/Makefile.targ	2012-09-30 22:04:19.400419050 +0400
+--- a/usr/src/lib/libc/Makefile.targ	2014-03-02 23:20:37.823065291 +0400
++++ b/usr/src/lib/libc/Makefile.targ	2014-03-02 23:20:59.385270147 +0400
 @@ -103,6 +103,10 @@
  
  # rules to build large file aware objects (xxx64.o from xxx.s or xxx.c)
diff --git a/libc/debian/patches/illumos-3141-strptime-t.patch b/libc/debian/patches/illumos-3141-strptime-t.patch
deleted file mode 100644
index 1dc049e..0000000
--- a/libc/debian/patches/illumos-3141-strptime-t.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-commit a11c1571b6942161b0186d0588609448066892c2
-Author: Gary Mills <gary_mills@fastmail.fm>
-Date:   Sun Jan 12 10:05:02 2014 -0600
-
-    3141 strptime() doesn't support %t
-    Reviewed by: Garett D'Amore <garett@damore.org>
-    Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
-    Approved by: Robert Mustacchi <rm@joyent.com>
-
-diff --git a/usr/src/lib/libc/port/locale/strptime.c b/usr/src/lib/libc/port/locale/strptime.c
-index fe0fc96..90150e3 100644
---- a/usr/src/lib/libc/port/locale/strptime.c
-+++ b/usr/src/lib/libc/port/locale/strptime.c
-@@ -1,4 +1,5 @@
- /*
-+ * Copyright (c) 2014 Gary Mills
-  * Copyright 2011, Nexenta Systems, Inc.  All rights reserved.
-  * Copyright (c) 1994 Powerdog Industries.  All rights reserved.
-  *
-@@ -215,9 +216,6 @@ label:
- 				tm->tm_sec = i;
- 			}
- 
--			if (isspace(*buf))
--				while (*ptr != 0 && !isspace(*ptr))
--					ptr++;
- 			break;
- 
- 		case 'H':
-@@ -249,9 +247,6 @@ label:
- 
- 			tm->tm_hour = i;
- 
--			if (isspace(*buf))
--				while (*ptr != 0 && !isspace(*ptr))
--					ptr++;
- 			break;
- 
- 		case 'p':
-@@ -319,9 +314,6 @@ label:
- 			if (i > 53)
- 				return (NULL);
- 
--			if (isspace(*buf))
--				while (*ptr != 0 && !isspace(*ptr))
--					ptr++;
- 			break;
- 
- 		case 'w':
-@@ -334,11 +326,9 @@ label:
- 
- 			tm->tm_wday = i;
- 
--			if (isspace(*buf))
--				while (*ptr != 0 && !isspace(*ptr))
--					ptr++;
- 			break;
- 
-+		case 'd':
- 		case 'e':
- 			/*
- 			 * The %e format has a space before single digits
-@@ -346,8 +336,6 @@ label:
- 			 */
- 			if (isspace(*buf))
- 				buf++;
--			/* FALLTHROUGH */
--		case 'd':
- 			/*
- 			 * The %e specifier is explicitly documented as not
- 			 * being zero-padded but there is no harm in allowing
-@@ -370,9 +358,6 @@ label:
- 
- 			tm->tm_mday = i;
- 
--			if (isspace(*buf))
--				while (*ptr != 0 && !isspace(*ptr))
--					ptr++;
- 			break;
- 
- 		case 'B':
-@@ -417,9 +402,6 @@ label:
- 
- 			tm->tm_mon = i - 1;
- 
--			if (isspace(*buf))
--				while (*ptr != NULL && !isspace(*ptr))
--					ptr++;
- 			break;
- 
- 		case 's':
-@@ -465,9 +447,6 @@ label:
- 
- 			tm->tm_year = i;
- 
--			if (isspace(*buf))
--				while (*ptr != 0 && !isspace(*ptr))
--					ptr++;
- 			break;
- 
- 		case 'Z':
-@@ -521,6 +500,11 @@ label:
- 			*flagsp |= F_GMT;
- 			}
- 			break;
-+		case 'n':
-+		case 't':
-+			while (isspace(*buf))
-+				buf++;
-+			break;
- 		}
- 	}
- 
diff --git a/libc/debian/patches/illumos-3243-getent-shadow.patch b/libc/debian/patches/illumos-3243-getent-shadow.patch
index 11dd72f..ca496d6 100644
--- a/libc/debian/patches/illumos-3243-getent-shadow.patch
+++ b/libc/debian/patches/illumos-3243-getent-shadow.patch
@@ -1,10 +1,10 @@
 Description: Add shadow support to getent(1)
  sudo package uses 'getent shadow root'
 Bug: https://www.illumos.org/issues/3243
-Index: libc/usr/src/cmd/getent/getent.c
+Index: b/usr/src/cmd/getent/getent.c
 ===================================================================
---- libc.orig/usr/src/cmd/getent/getent.c	2012-10-03 22:48:19.289675091 +0400
-+++ libc/usr/src/cmd/getent/getent.c	2012-10-03 22:48:54.412674705 +0400
+--- a/usr/src/cmd/getent/getent.c	2014-03-02 23:20:16.561911384 +0400
++++ b/usr/src/cmd/getent/getent.c	2014-03-02 23:22:03.943281209 +0400
 @@ -42,6 +42,7 @@
  
  static struct table t[] = {
@@ -13,10 +13,10 @@ Index: libc/usr/src/cmd/getent/getent.c
  	{ "group",	dogetgr },
  	{ "hosts",	dogethost },
  	{ "ipnodes",	dogetipnodes },
-Index: libc/usr/src/cmd/getent/Makefile
+Index: b/usr/src/cmd/getent/Makefile
 ===================================================================
---- libc.orig/usr/src/cmd/getent/Makefile	2012-10-03 22:48:54.311948358 +0400
-+++ libc/usr/src/cmd/getent/Makefile	2012-10-03 22:48:54.413606711 +0400
+--- a/usr/src/cmd/getent/Makefile	2014-03-02 23:22:01.564110989 +0400
++++ b/usr/src/cmd/getent/Makefile	2014-03-02 23:22:03.944799150 +0400
 @@ -41,6 +41,7 @@
  	dogetproject.o	\
  	dogetproto.o	\
@@ -25,10 +25,10 @@ Index: libc/usr/src/cmd/getent/Makefile
  	dogetserv.o	\
  	getent.o
  
-Index: libc/usr/src/cmd/getent/dogetsp.c
+Index: b/usr/src/cmd/getent/dogetsp.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/cmd/getent/dogetsp.c	2012-10-04 10:51:49.024584484 +0400
++++ b/usr/src/cmd/getent/dogetsp.c	2014-03-02 23:22:03.946237426 +0400
 @@ -0,0 +1,62 @@
 +/*
 + * CDDL HEADER START
@@ -92,10 +92,10 @@ Index: libc/usr/src/cmd/getent/dogetsp.c
 +
 +	return (rc);
 +}
-Index: libc/usr/src/cmd/getent/getent.h
+Index: b/usr/src/cmd/getent/getent.h
 ===================================================================
---- libc.orig/usr/src/cmd/getent/getent.h	2012-10-03 22:48:19.289736256 +0400
-+++ libc/usr/src/cmd/getent/getent.h	2012-10-03 22:48:54.415441373 +0400
+--- a/usr/src/cmd/getent/getent.h	2014-03-02 23:20:16.561856197 +0400
++++ b/usr/src/cmd/getent/getent.h	2014-03-02 23:22:03.947307846 +0400
 @@ -42,6 +42,7 @@
  #define	EXC_ENUM_NOT_SUPPORTED	3
  
@@ -104,10 +104,10 @@ Index: libc/usr/src/cmd/getent/getent.h
  extern int dogetgr(const char **);
  extern int dogethost(const char **);
  extern int dogetipnodes(const char **);
-Index: libc/usr/src/man/man1m/getent.1m
+Index: b/usr/src/man/man1m/getent.1m
 ===================================================================
---- libc.orig/usr/src/man/man1m/getent.1m	2012-09-30 20:41:28.000000000 +0400
-+++ libc/usr/src/man/man1m/getent.1m	2012-10-04 00:55:38.283472015 +0400
+--- a/usr/src/man/man1m/getent.1m	2014-03-02 23:20:16.561984530 +0400
++++ b/usr/src/man/man1m/getent.1m	2014-03-02 23:22:03.949619471 +0400
 @@ -21,10 +21,10 @@
  .sp
  .LP
diff --git a/libc/debian/patches/illumos-3244-ret_val-uninitialized.patch b/libc/debian/patches/illumos-3244-ret_val-uninitialized.patch
index bfad35c..437cbc2 100644
--- a/libc/debian/patches/illumos-3244-ret_val-uninitialized.patch
+++ b/libc/debian/patches/illumos-3244-ret_val-uninitialized.patch
@@ -3,10 +3,10 @@ Description: 'ret_val' may be used uninitialized
  utmpd.c:406:5: error: 'ret_val' may be used uninitialized
  in this function [-Werror=uninitialized]
 Bug: https://www.illumos.org/issues/3244
-Index: libc/usr/src/cmd/utmpd/utmpd.c
+Index: b/usr/src/cmd/utmpd/utmpd.c
 ===================================================================
---- libc.orig/usr/src/cmd/utmpd/utmpd.c	2012-09-30 22:27:59.525272136 +0400
-+++ libc/usr/src/cmd/utmpd/utmpd.c	2012-09-30 22:29:01.560180335 +0400
+--- a/usr/src/cmd/utmpd/utmpd.c	2014-03-02 23:20:15.957682277 +0400
++++ b/usr/src/cmd/utmpd/utmpd.c	2014-03-02 23:22:07.029127601 +0400
 @@ -351,7 +351,7 @@
  	register struct pollfd *pfd;
  	register int i;
diff --git a/libc/debian/patches/illumos-3253-tsol-workaround.patch b/libc/debian/patches/illumos-3253-tsol-workaround.patch
index b9ef7fc..fdca7f7 100644
--- a/libc/debian/patches/illumos-3253-tsol-workaround.patch
+++ b/libc/debian/patches/illumos-3253-tsol-workaround.patch
@@ -1,9 +1,9 @@
 Description: <tsol/label.h> is not actually needed
 Bug: https://www.illumos.org/issues/3253
-Index: libc/usr/src/lib/libc/port/gen/ucred.c
+Index: b/usr/src/lib/libc/port/gen/ucred.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/gen/ucred.c	2012-09-30 20:41:22.000000000 +0400
-+++ libc/usr/src/lib/libc/port/gen/ucred.c	2012-10-03 22:43:39.610855793 +0400
+--- a/usr/src/lib/libc/port/gen/ucred.c	2014-03-02 23:20:22.828876582 +0400
++++ b/usr/src/lib/libc/port/gen/ucred.c	2014-03-02 23:21:44.852628894 +0400
 @@ -66,7 +66,10 @@
  #include <sys/procfs.h>
  #include <sys/sysmacros.h>
@@ -16,10 +16,10 @@ Index: libc/usr/src/lib/libc/port/gen/ucred.c
  
  ucred_t *
  _ucred_alloc(void)
-Index: libc/usr/src/head/zone.h
+Index: b/usr/src/head/zone.h
 ===================================================================
---- libc.orig/usr/src/head/zone.h	2012-09-30 20:41:17.000000000 +0400
-+++ libc/usr/src/head/zone.h	2012-10-03 22:48:45.162400433 +0400
+--- a/usr/src/head/zone.h	2014-03-02 23:20:22.828776093 +0400
++++ b/usr/src/head/zone.h	2014-03-02 23:21:44.854829447 +0400
 @@ -29,7 +29,7 @@
  #include <sys/types.h>
  #include <sys/zone.h>
@@ -29,11 +29,11 @@ Index: libc/usr/src/head/zone.h
  
  #ifdef	__cplusplus
  extern "C" {
-Index: libc/usr/src/lib/libnsl/rpc/svc_generic.c
+Index: b/usr/src/lib/libnsl/rpc/svc_generic.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/svc_generic.c	2012-09-30 20:41:24.000000000 +0400
-+++ libc/usr/src/lib/libnsl/rpc/svc_generic.c	2012-10-03 23:06:53.883069004 +0400
-@@ -48,7 +48,7 @@
+--- a/usr/src/lib/libnsl/rpc/svc_generic.c	2014-03-02 23:20:22.830409816 +0400
++++ b/usr/src/lib/libnsl/rpc/svc_generic.c	2014-03-02 23:21:44.857594058 +0400
+@@ -49,7 +49,7 @@
  #include <malloc.h>
  #include <string.h>
  #include <stropts.h>
@@ -42,10 +42,10 @@ Index: libc/usr/src/lib/libnsl/rpc/svc_generic.c
  #include <nfs/nfs.h>
  #include <nfs/nfs_acl.h>
  #include <rpcsvc/mount.h>
-Index: libc/usr/src/lib/libnsl/rpc/ti_opts.c
+Index: b/usr/src/lib/libnsl/rpc/ti_opts.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/ti_opts.c	2012-09-30 20:41:24.000000000 +0400
-+++ libc/usr/src/lib/libnsl/rpc/ti_opts.c	2012-10-03 23:08:25.301792119 +0400
+--- a/usr/src/lib/libnsl/rpc/ti_opts.c	2014-03-02 23:20:22.828930429 +0400
++++ b/usr/src/lib/libnsl/rpc/ti_opts.c	2014-03-02 23:21:44.859431053 +0400
 @@ -58,7 +58,7 @@
  #include <alloca.h>
  #include <stdlib.h>
diff --git a/libc/debian/patches/illumos-3436-relocatable-objects-also-need-sloppy-relocation.patch b/libc/debian/patches/illumos-3436-relocatable-objects-also-need-sloppy-relocation.patch
deleted file mode 100644
index b1cce57..0000000
--- a/libc/debian/patches/illumos-3436-relocatable-objects-also-need-sloppy-relocation.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 396f90f95f3331a5b0c3fa020d44414df08f2f9a Mon Sep 17 00:00:00 2001
-From: Richard Lowe <richlowe@richlowe.net>
-Date: Tue, 1 Jan 2013 21:14:26 -0500
-Subject: [PATCH 3/3] 3436 relocatable objects also need sloppy relocation
- Reviewed by: Gordon Ross <gwr@nexenta.com> Reviewed by:
- Robert Mustacchi <rm@joyent.com> Approved by: Garrett
- D'Amore <garrett@damore.org>
-
----
- usr/src/cmd/sgs/libld/common/place.c |   34 ++++++++++++++++++++++------------
- 1 files changed, 22 insertions(+), 12 deletions(-)
-
-diff --git a/usr/src/cmd/sgs/libld/common/place.c b/usr/src/cmd/sgs/libld/common/place.c
-index 1b32572..d56e205 100644
---- a/usr/src/cmd/sgs/libld/common/place.c
-+++ b/usr/src/cmd/sgs/libld/common/place.c
-@@ -851,6 +851,13 @@ ld_place_section(Ofl_desc *ofl, Is_desc *isp, Place_path_info *path_info,
- 	}
- 
- 	/*
-+	 * When building relocatable objects, we must not redirect COMDAT
-+	 * section names into their outputs, such that our output object may
-+	 * be successfully used as an input object also requiring COMDAT
-+	 * processing
-+	 */
-+
-+	/*
- 	 * GNU section names may follow the convention:
- 	 *
- 	 *	.gnu.linkonce.*
-@@ -863,13 +870,15 @@ ld_place_section(Ofl_desc *ofl, Is_desc *isp, Place_path_info *path_info,
- 	 * because we know the name is not NULL, and therefore must have
- 	 * at least one character plus a NULL termination.
- 	 */
--	if (((ofl->ofl_flags & FLG_OF_RELOBJ) == 0) &&
--	    (isp->is_name == oname) && (isp->is_name[1] == 'g') &&
-+	if ((isp->is_name == oname) && (isp->is_name[1] == 'g') &&
- 	    (strncmp(MSG_ORIG(MSG_SCN_GNU_LINKONCE), isp->is_name,
- 	    MSG_SCN_GNU_LINKONCE_SIZE) == 0)) {
--		if ((oname =
--		    (char *)gnu_linkonce_sec(isp->is_name)) != isp->is_name) {
--			DBG_CALL(Dbg_sec_redirected(ofl->ofl_lml, isp, oname));
-+		if ((ofl->ofl_flags & FLG_OF_RELOBJ) == 0) {
-+			if ((oname = (char *)gnu_linkonce_sec(isp->is_name)) !=
-+			    isp->is_name) {
-+				DBG_CALL(Dbg_sec_redirected(ofl->ofl_lml, isp,
-+				    oname));
-+			}
- 		}
- 
- 		/*
-@@ -894,16 +903,17 @@ ld_place_section(Ofl_desc *ofl, Is_desc *isp, Place_path_info *path_info,
- 	 * sections, and this identification can be triggered by a pattern
- 	 * match section names.
- 	 */
--	if (((ofl->ofl_flags & FLG_OF_RELOBJ) == 0) &&
--	    (isp->is_name == oname) && (isp->is_flags & FLG_IS_COMDAT) &&
-+	if ((isp->is_name == oname) && (isp->is_flags & FLG_IS_COMDAT) &&
- 	    ((sname = gnu_comdat_sym(ifl, isp)) != NULL)) {
- 		size_t	size = sname - isp->is_name;
- 
--		if ((oname = libld_malloc(size + 1)) == NULL)
--			return ((Os_desc *)S_ERROR);
--		(void) strncpy(oname, isp->is_name, size);
--		oname[size] = '\0';
--		DBG_CALL(Dbg_sec_redirected(ofl->ofl_lml, isp, oname));
-+		if ((ofl->ofl_flags & FLG_OF_RELOBJ) == 0) {
-+			if ((oname = libld_malloc(size + 1)) == NULL)
-+				return ((Os_desc *)S_ERROR);
-+			(void) strncpy(oname, isp->is_name, size);
-+			oname[size] = '\0';
-+			DBG_CALL(Dbg_sec_redirected(ofl->ofl_lml, isp, oname));
-+		}
- 
- 		/*
- 		 * Enable relaxed relocation processing, as this is
--- 
-1.7.8.6
-
diff --git a/libc/debian/patches/illumos-3439-discarded-sections-shouldn-t-end-up-on-output-l.patch b/libc/debian/patches/illumos-3439-discarded-sections-shouldn-t-end-up-on-output-l.patch
deleted file mode 100644
index c4b266f..0000000
--- a/libc/debian/patches/illumos-3439-discarded-sections-shouldn-t-end-up-on-output-l.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c866e237403b3963d45fc1274b9a2e7f09aa97d7 Mon Sep 17 00:00:00 2001
-From: Richard Lowe <richlowe@richlowe.net>
-Date: Tue, 1 Jan 2013 16:07:37 -0500
-Subject: [PATCH 2/3] 3439 discarded sections shouldn't end up on output lists
- Reviewed by: Gordon Ross <gwr@nexenta.com> Reviewed by:
- Robert Mustacchi <rm@joyent.com> Approved by: Garrett
- D'Amore <garrett@damore.org>
-
----
- usr/src/cmd/sgs/libld/common/place.c |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/usr/src/cmd/sgs/libld/common/place.c b/usr/src/cmd/sgs/libld/common/place.c
-index 33e980b..1b32572 100644
---- a/usr/src/cmd/sgs/libld/common/place.c
-+++ b/usr/src/cmd/sgs/libld/common/place.c
-@@ -1199,6 +1199,7 @@ ld_place_section(Ofl_desc *ofl, Is_desc *isp, Place_path_info *path_info,
- 	 * so that they can be updated as a group later.
- 	 */
- 	if ((shdr->sh_type == SHT_GROUP) &&
-+	    ((isp->is_flags & FLG_IS_DISCARD) == 0) &&
- 	    (aplist_append(&ofl->ofl_osgroups, osp,
- 	    AL_CNT_OFL_OSGROUPS) == NULL))
- 		return ((Os_desc *)S_ERROR);
--- 
-1.7.8.6
-
diff --git a/libc/debian/patches/illumos-3453-GNU-comdat-redirection-does-exactly-the-wrong-t.patch b/libc/debian/patches/illumos-3453-GNU-comdat-redirection-does-exactly-the-wrong-t.patch
deleted file mode 100644
index 0798b75..0000000
--- a/libc/debian/patches/illumos-3453-GNU-comdat-redirection-does-exactly-the-wrong-t.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 84f7afedea22404244c98d9bd5743d6b8db0c5e4 Mon Sep 17 00:00:00 2001
-From: Richard Lowe <richlowe@richlowe.net>
-Date: Wed, 9 Jan 2013 00:43:09 +0000
-Subject: [PATCH 1/3] 3453 GNU comdat redirection does exactly the wrong thing
- Reviewed by: Jason King <jason.brian.king@gmail.com>
- Reviewed by: Robert Mustacchi <rm@joyent.com> Approved
- by: Garrett D'Amore <garrett@damore.org>
-
----
- usr/src/cmd/sgs/libld/common/place.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/usr/src/cmd/sgs/libld/common/place.c b/usr/src/cmd/sgs/libld/common/place.c
-index 4862e54..33e980b 100644
---- a/usr/src/cmd/sgs/libld/common/place.c
-+++ b/usr/src/cmd/sgs/libld/common/place.c
-@@ -325,7 +325,7 @@ gnu_comdat_sym(Ifl_desc *ifl, Is_desc *gisp)
- 		 * link-edits.  For now, size the section name dynamically.
- 		 */
- 		ssize = strlen(isp->is_name);
--		if ((strncmp(isp->is_name, gisp->is_name, ssize) != 0) &&
-+		if ((strncmp(isp->is_name, gisp->is_name, ssize) == 0) &&
- 		    (gisp->is_name[ssize] == '.'))
- 			return ((char *)&gisp->is_name[ssize]);
- 	}
--- 
-1.7.8.6
-
diff --git a/libc/debian/patches/illumos-3687-fopen-e.patch b/libc/debian/patches/illumos-3687-fopen-e.patch
deleted file mode 100644
index 24cb2ae..0000000
--- a/libc/debian/patches/illumos-3687-fopen-e.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit b89a2c3e86acf555d0e45c283052876d244d9e6b
-Author: Theo Schlossnagle <jesus@omniti.com>
-Date:   Wed Apr 17 10:28:26 2013 -0400
-
-    3687 fopen() O_CLOEXEC support via the "e" flag
-    Reviewed by Robert Mustacchi <rm@joyent.com>
-    Reviewed by Richard Lowe <richlowe@richlowe.net>
-    Approved by Dan McDonald <danmcd@nexenta.com>
-
-diff --git a/usr/src/lib/libc/port/stdio/_endopen.c b/usr/src/lib/libc/port/stdio/_endopen.c
-index 8e9ef79..b1f6d12 100644
---- a/usr/src/lib/libc/port/stdio/_endopen.c
-+++ b/usr/src/lib/libc/port/stdio/_endopen.c
-@@ -27,7 +27,7 @@
- /*	Copyright (c) 1988 AT&T	*/
- /*	  All Rights Reserved  	*/
- 
--#pragma ident	"%Z%%M%	%I%	%E% SMI"
-+/* Copyright (c) 2013 OmniTI Computer Consulting, Inc. All rights reserved. */
- 
- /*
-  *	This routine is a special case, in that it is aware of
-@@ -55,8 +55,8 @@
- FILE *
- _endopen(const char *name, const char *type, FILE *iop, int largefile)
- {
--	int oflag, fd, fflag;
--	char plus;
-+	int oflag, fd, fflag, eflag, plusflag;
-+	const char *echr;
- 
- 	if (iop == NULL)
- 		return (NULL);
-@@ -77,10 +77,27 @@ _endopen(const char *name, const char *type, FILE *iop, int largefile)
- 		fflag = _IOWRT;
- 		break;
- 	}
--	/* UNIX ignores 'b' and treats text and binary the same */
--	if ((plus = type[1]) == 'b')
--		plus = type[2];
--	if (plus == '+') {
-+
-+	plusflag = 0;
-+	eflag = 0;
-+	for (echr = type + 1; *echr != '\0'; echr++) {
-+		switch (*echr) {
-+		/* UNIX ignores 'b' and treats text and binary the same */
-+		default:
-+			break;
-+		case '+':
-+			plusflag = 1;
-+			break;
-+		case 'e':
-+			eflag = 1;
-+			break;
-+		}
-+	}
-+	if (eflag) {
-+		/* Subsequent to a mode flag, 'e' indicates O_CLOEXEC */
-+		oflag = oflag | O_CLOEXEC;
-+	}
-+	if (plusflag) {
- 		oflag = (oflag & ~(O_RDONLY | O_WRONLY)) | O_RDWR;
- 		fflag = _IORW;
- 	}
diff --git a/libc/debian/patches/illumos-3787.patch b/libc/debian/patches/illumos-3787.patch
deleted file mode 100644
index 2bf0609..0000000
--- a/libc/debian/patches/illumos-3787.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 693e4d84eb49b987c3d66cbcd4b13a5c6e9059bf Mon Sep 17 00:00:00 2001
-From: Alexander Pyhalov <apyhalov@gmail.com>
-Date: Fri, 14 Jun 2013 10:16:47 +0400
-Subject: [PATCH] 3787 gcc4.7 __cplusplus change incompatibility 3823 wchar.h
- and wctype_iso.h incompatibility Reviewed by: Albert Lee <trisk@nexenta.com>
- Approved by: Dan McDonald <danmcd@nexenta.com>
-
----
- usr/src/head/iso/stdio_iso.h  |  6 ++----
- usr/src/head/iso/stdlib_iso.h | 10 ++++------
- usr/src/head/wchar.h          | 25 +++++++++++++++++++++++++
- 3 files changed, 31 insertions(+), 10 deletions(-)
-
-diff --git a/usr/src/head/iso/stdio_iso.h b/usr/src/head/iso/stdio_iso.h
-index e2272c5..f974ad5 100644
---- a/usr/src/head/iso/stdio_iso.h
-+++ b/usr/src/head/iso/stdio_iso.h
-@@ -46,8 +46,6 @@
- #ifndef _ISO_STDIO_ISO_H
- #define	_ISO_STDIO_ISO_H
- 
--#pragma ident	"%Z%%M%	%I%	%E% SMI"
--
- #include <sys/feature_tests.h>
- #include <sys/va_list.h>
- #include <stdio_tag.h>
-@@ -331,7 +329,7 @@ extern size_t	fwrite(const void *_RESTRICT_KYWD, size_t, size_t,
- 
- #if !defined(__lint)
- 
--#if	!defined(_REENTRANT) && !defined(_LP64) && !defined(_STRICT_STDC)
-+#if	!defined(_REENTRANT) && !defined(_LP64)
- 
- #ifdef	__STDC__
- #if __cplusplus >= 199711L
-@@ -353,7 +351,7 @@ inline int putc(int _x, FILE *_p) {
- 				(int)(*(p)->_ptr++ = (unsigned char) (x)))
- #endif	/* __STDC__ */
- 
--#endif /* !defined(_REENTRANT) && !defined(_LP64) && !defined(_STRICT_STDC) */
-+#endif /* !defined(_REENTRANT) && !defined(_LP64) */
- 
- #ifndef	_REENTRANT
- 
-diff --git a/usr/src/head/iso/stdlib_iso.h b/usr/src/head/iso/stdlib_iso.h
-index 2a636c5..17577a9 100644
---- a/usr/src/head/iso/stdlib_iso.h
-+++ b/usr/src/head/iso/stdlib_iso.h
-@@ -43,8 +43,6 @@
- #ifndef _ISO_STDLIB_ISO_H
- #define	_ISO_STDLIB_ISO_H
- 
--#pragma ident	"%Z%%M%	%I%	%E% SMI"
--
- #include <sys/feature_tests.h>
- 
- #ifdef	__cplusplus
-@@ -128,12 +126,12 @@
- extern long int atol(const char *);
- extern void *bsearch(const void *, const void *, size_t, size_t,
- 	int (*)(const void *, const void *));
--#if __cplusplus >= 199711L
-+#if __cplusplus >= 199711L && defined(__SUNPRO_CC)
- extern "C++" {
- 	void *bsearch(const void *, const void *, size_t, size_t,
- 		int (*)(const void *, const void *));
- }
--#endif /* __cplusplus >= 199711L */
-+#endif /* __cplusplus >= 199711L && defined(__SUNPRO_CC) */
- extern void *calloc(size_t, size_t);
- extern div_t div(int, int);
- extern void exit(int)
-@@ -148,11 +146,11 @@ extern size_t mbstowcs(wchar_t *_RESTRICT_KYWD, const char *_RESTRICT_KYWD,
- 	size_t);
- extern int mbtowc(wchar_t *_RESTRICT_KYWD, const char *_RESTRICT_KYWD, size_t);
- extern void qsort(void *, size_t, size_t, int (*)(const void *, const void *));
--#if __cplusplus >= 199711L
-+#if __cplusplus >= 199711L && defined(__SUNPRO_CC)
- extern "C++" {
- 	void qsort(void *, size_t, size_t, int (*)(const void *, const void *));
- }
--#endif /* __cplusplus >= 199711L */
-+#endif /* __cplusplus >= 199711L && defined(__SUNPRO_CC) */
- extern int rand(void);
- extern void *realloc(void *, size_t);
- extern void srand(unsigned int);
-diff --git a/usr/src/head/wchar.h b/usr/src/head/wchar.h
-index 781b57a..b804698 100644
---- a/usr/src/head/wchar.h
-+++ b/usr/src/head/wchar.h
-@@ -122,6 +122,9 @@
- #ifdef __STDC__
- 
- #if !defined(_STRICT_STDC) || defined(_XOPEN_SOURCE) || defined(__EXTENSIONS__)
-+#if __cplusplus >= 199711L
-+namespace std {
-+#endif
- extern int iswalpha(wint_t);
- extern int iswupper(wint_t);
- extern int iswlower(wint_t);
-@@ -140,6 +143,28 @@
- extern int wcswidth(const wchar_t *, size_t);
- extern int wcwidth(wchar_t);
- extern wctype_t wctype(const char *);
-+#if __cplusplus >= 199711L
-+} /* namespace std */
-+
-+using std::iswalpha;
-+using std::iswupper;
-+using std::iswlower;
-+using std::iswdigit;
-+using std::iswxdigit;
-+using std::iswalnum;
-+using std::iswspace;
-+using std::iswpunct;
-+using std::iswprint;
-+using std::iswgraph;
-+using std::iswcntrl;
-+using std::iswctype;
-+using std::towlower;
-+using std::towupper;
-+using std::wcswcs;
-+using std::wcswidth;
-+using std::wcwidth;
-+using std::wctype;
-+#endif
- #endif /* !defined(_STRICT_STDC) || defined(_XOPEN_SOURCE)... */
- 
- #if defined(__EXTENSIONS__) || \
--- 
-1.8.1.6
-
diff --git a/libc/debian/patches/illumos-4294-fopen-x.patch b/libc/debian/patches/illumos-4294-fopen-x.patch
deleted file mode 100644
index 7dd2865..0000000
--- a/libc/debian/patches/illumos-4294-fopen-x.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-commit b5e595027fe431bb04a0f9b86ceb323a2d702dda
-Author: Robert Mustacchi <rm@joyent.com>
-Date:   Fri Nov 1 02:09:06 2013 +0000
-
-    4294 fopen could support 'x'
-    Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
-    Reviewed by: Joshua M. Clulow <jmc@joyent.com>
-    Reviewed by: Jason King <jason.brian.king@gmail.com>
-    Reviewed by: Marcel Telka <marcel@telka.sk>
-    Reviewed by: Garrett D'Amore <garrett@damore.org>
-    Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
-    Approved by: Gordon Ross <gordon.ross@nexenta.com>
-
-diff --git a/usr/src/lib/libc/port/stdio/_endopen.c b/usr/src/lib/libc/port/stdio/_endopen.c
-index b1f6d12..a7c4508 100644
---- a/usr/src/lib/libc/port/stdio/_endopen.c
-+++ b/usr/src/lib/libc/port/stdio/_endopen.c
-@@ -55,7 +55,7 @@
- FILE *
- _endopen(const char *name, const char *type, FILE *iop, int largefile)
- {
--	int oflag, fd, fflag, eflag, plusflag;
-+	int oflag, fd, fflag, eflag, plusflag, xflag;
- 	const char *echr;
- 
- 	if (iop == NULL)
-@@ -80,6 +80,7 @@ _endopen(const char *name, const char *type, FILE *iop, int largefile)
- 
- 	plusflag = 0;
- 	eflag = 0;
-+	xflag = 0;
- 	for (echr = type + 1; *echr != '\0'; echr++) {
- 		switch (*echr) {
- 		/* UNIX ignores 'b' and treats text and binary the same */
-@@ -91,6 +92,9 @@ _endopen(const char *name, const char *type, FILE *iop, int largefile)
- 		case 'e':
- 			eflag = 1;
- 			break;
-+		case 'x':
-+			xflag = 1;
-+			break;
- 		}
- 	}
- 	if (eflag) {
-@@ -101,6 +105,9 @@ _endopen(const char *name, const char *type, FILE *iop, int largefile)
- 		oflag = (oflag & ~(O_RDONLY | O_WRONLY)) | O_RDWR;
- 		fflag = _IORW;
- 	}
-+	if (xflag) {
-+		oflag |= O_EXCL;
-+	}
- 
- 	/* select small or large file open based on flag */
- 	if (largefile) {
diff --git a/libc/debian/patches/illumos-72-libnsl-t_error.patch b/libc/debian/patches/illumos-72-libnsl-t_error.patch
deleted file mode 100644
index 1bf9dac..0000000
--- a/libc/debian/patches/illumos-72-libnsl-t_error.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From ace0359e9b3ac0b4bb7ddb51ae9138de3df33789 Mon Sep 17 00:00:00 2001
-From: Gary Mills <gary_mills@fastmail.fm>
-Date: Sat, 13 Oct 2012 10:17:57 -0500
-Subject: [PATCH] 72 _tx_error needs to preserve the errno value it is
- supposed to display Reviewed by: Garrett D'Amore
- <garrett@damore.org> Approved by: Richard Lowe
- <richlowe@richlowe.net>
-
----
- usr/src/lib/libnsl/nsl/t_error.c |   21 +++++++++------------
- 1 file changed, 9 insertions(+), 12 deletions(-)
-
-diff --git a/usr/src/lib/libnsl/nsl/t_error.c b/usr/src/lib/libnsl/nsl/t_error.c
-index cc316de..4bd7448 100644
---- a/usr/src/lib/libnsl/nsl/t_error.c
-+++ b/usr/src/lib/libnsl/nsl/t_error.c
-@@ -26,10 +26,9 @@
- /*
-  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-  * Use is subject to license terms.
-+ * Copyright (c) 2012 Gary Mills
-  */
- 
--#pragma ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.2 */
--
- #include "mt.h"
- #include <xti.h>
- #include <errno.h>
-@@ -42,21 +41,19 @@ int
- _tx_error(const char *s, int api_semantics)
- {
- 	const char *c;
--	int n;
-+	int errnum = errno;	/* In case a system call fails. */
- 
- 	c = t_strerror(t_errno);
- 	if (s != NULL && *s != '\0') {
--		n = strlen(s);
--		if (n) {
--			(void) write(2, s, (unsigned)n);
--			(void) write(2, ": ", 2);
--		}
-+		(void) write(2, s, strlen(s));
-+		(void) write(2, ": ", 2);
- 	}
--	(void) write(2, c, (unsigned)strlen(c));
-+	(void) write(2, c, strlen(c));
- 	if (t_errno == TSYSERR) {
-+		c = strerror(errnum);
- 		(void) write(2, ": ", 2);
--		perror("");
--	} else
--		(void) write(2, "\n", 1);
-+		(void) write(2, c, strlen(c));
-+	}
-+	(void) write(2, "\n", 1);
- 	return (0);
- }
--- 
-1.7.10.4
-
diff --git a/libc/debian/patches/libc-NULL-undeclared.patch b/libc/debian/patches/libc-NULL-undeclared.patch
index f1080ee..39f05f9 100644
--- a/libc/debian/patches/libc-NULL-undeclared.patch
+++ b/libc/debian/patches/libc-NULL-undeclared.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/lib/libc/port/fp/ieee_globals.c
+Index: b/usr/src/lib/libc/port/fp/ieee_globals.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/fp/ieee_globals.c	2012-10-08 00:25:38.000000000 +0000
-+++ libc/usr/src/lib/libc/port/fp/ieee_globals.c	2012-11-14 21:37:10.841800572 +0000
+--- a/usr/src/lib/libc/port/fp/ieee_globals.c	2014-03-02 23:20:03.084406058 +0400
++++ b/usr/src/lib/libc/port/fp/ieee_globals.c	2014-03-02 23:22:55.468427240 +0400
 @@ -41,6 +41,7 @@
   */
  
@@ -10,10 +10,10 @@ Index: libc/usr/src/lib/libc/port/fp/ieee_globals.c
  #include <thread.h>
  #include <synch.h>
  #include <mtlib.h>
-Index: libc/usr/src/lib/libc/port/gen/catgets.c
+Index: b/usr/src/lib/libc/port/gen/catgets.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/gen/catgets.c	2012-10-08 00:25:38.000000000 +0000
-+++ libc/usr/src/lib/libc/port/gen/catgets.c	2012-11-14 21:38:02.925245061 +0000
+--- a/usr/src/lib/libc/port/gen/catgets.c	2014-03-02 23:20:03.084592693 +0400
++++ b/usr/src/lib/libc/port/gen/catgets.c	2014-03-02 23:22:55.470498275 +0400
 @@ -33,6 +33,7 @@
  #pragma weak _catgets = catgets
  
@@ -22,10 +22,10 @@ Index: libc/usr/src/lib/libc/port/gen/catgets.c
  #include <sys/types.h>
  #include <nl_types.h>
  #include <errno.h>
-Index: libc/usr/src/lib/libc/port/gen/tfind.c
+Index: b/usr/src/lib/libc/port/gen/tfind.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/gen/tfind.c	2012-10-08 00:25:38.000000000 +0000
-+++ libc/usr/src/lib/libc/port/gen/tfind.c	2012-11-14 21:45:36.180914710 +0000
+--- a/usr/src/lib/libc/port/gen/tfind.c	2014-03-02 23:20:03.084631677 +0400
++++ b/usr/src/lib/libc/port/gen/tfind.c	2014-03-02 23:22:55.471748496 +0400
 @@ -39,6 +39,7 @@
  #pragma weak _tfind = tfind
  
@@ -34,10 +34,10 @@ Index: libc/usr/src/lib/libc/port/gen/tfind.c
  #include <mtlib.h>
  #include <sys/types.h>
  #include <search.h>
-Index: libc/usr/src/lib/libc/port/sys/exacctsys.c
+Index: b/usr/src/lib/libc/port/sys/exacctsys.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/sys/exacctsys.c	2012-10-08 00:25:38.000000000 +0000
-+++ libc/usr/src/lib/libc/port/sys/exacctsys.c	2012-11-14 22:04:59.935870231 +0000
+--- a/usr/src/lib/libc/port/sys/exacctsys.c	2014-03-02 23:20:03.084460497 +0400
++++ b/usr/src/lib/libc/port/sys/exacctsys.c	2014-03-02 23:22:55.473293707 +0400
 @@ -31,6 +31,7 @@
  #pragma weak _wracct = wracct
  
@@ -46,10 +46,10 @@ Index: libc/usr/src/lib/libc/port/sys/exacctsys.c
  #include <sys/types.h>
  #include <sys/syscall.h>
  #include <sys/procset.h>
-Index: libc/usr/src/lib/libc/port/sys/rctlsys.c
+Index: b/usr/src/lib/libc/port/sys/rctlsys.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/sys/rctlsys.c	2012-10-08 00:25:38.000000000 +0000
-+++ libc/usr/src/lib/libc/port/sys/rctlsys.c	2012-11-14 22:06:03.855861317 +0000
+--- a/usr/src/lib/libc/port/sys/rctlsys.c	2014-03-02 23:20:03.084555981 +0400
++++ b/usr/src/lib/libc/port/sys/rctlsys.c	2014-03-02 23:22:55.474388166 +0400
 @@ -30,6 +30,7 @@
  #pragma weak _setrctl = setrctl
  
@@ -58,10 +58,10 @@ Index: libc/usr/src/lib/libc/port/sys/rctlsys.c
  #include <sys/types.h>
  #include <sys/syscall.h>
  #include <sys/rctl.h>
-Index: libc/usr/src/lib/libc/port/sys/sidsys.c
+Index: b/usr/src/lib/libc/port/sys/sidsys.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/sys/sidsys.c	2012-10-08 00:25:38.000000000 +0000
-+++ libc/usr/src/lib/libc/port/sys/sidsys.c	2012-11-14 22:06:58.244878218 +0000
+--- a/usr/src/lib/libc/port/sys/sidsys.c	2014-03-02 23:20:03.084516508 +0400
++++ b/usr/src/lib/libc/port/sys/sidsys.c	2014-03-02 23:22:55.475401517 +0400
 @@ -29,6 +29,7 @@
   */
  
@@ -70,10 +70,10 @@ Index: libc/usr/src/lib/libc/port/sys/sidsys.c
  #include <sys/sid.h>
  #include <sys/syscall.h>
  
-Index: libc/usr/src/common/unicode/uconv.c
+Index: b/usr/src/common/unicode/uconv.c
 ===================================================================
---- libc.orig/usr/src/common/unicode/uconv.c	2012-10-08 00:25:35.000000000 +0000
-+++ libc/usr/src/common/unicode/uconv.c	2012-11-14 22:09:13.961384479 +0000
+--- a/usr/src/common/unicode/uconv.c	2014-03-02 23:20:03.084256646 +0400
++++ b/usr/src/common/unicode/uconv.c	2014-03-02 23:22:55.478193867 +0400
 @@ -34,6 +34,7 @@
   * Interface stability: Committed
   */
diff --git a/libc/debian/patches/libc-add-cfmakeraw.patch b/libc/debian/patches/libc-add-cfmakeraw.patch
index f45b6a8..f335acf 100644
--- a/libc/debian/patches/libc-add-cfmakeraw.patch
+++ b/libc/debian/patches/libc-add-cfmakeraw.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/head/termios.h
+Index: b/usr/src/head/termios.h
 ===================================================================
---- libc.orig/usr/src/head/termios.h	2012-10-08 04:25:37.000000000 +0400
-+++ libc/usr/src/head/termios.h	2014-02-02 16:01:32.167223158 +0400
+--- a/usr/src/head/termios.h	2014-03-02 23:19:35.284157452 +0400
++++ b/usr/src/head/termios.h	2014-03-02 23:24:22.264953722 +0400
 @@ -28,6 +28,16 @@
  
  #pragma ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.2	*/
@@ -19,10 +19,10 @@ Index: libc/usr/src/head/termios.h
 +__END_DECLS
 +
  #endif	/* _TERMIOS_H */
-Index: libc/usr/src/lib/libc/port/gen/cfmakeraw.c
+Index: b/usr/src/lib/libc/port/gen/cfmakeraw.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/lib/libc/port/gen/cfmakeraw.c	2014-01-23 18:06:58.320548860 +0400
++++ b/usr/src/lib/libc/port/gen/cfmakeraw.c	2014-03-02 23:24:22.267187476 +0400
 @@ -0,0 +1,19 @@
 +/*
 + * Public Domain.
@@ -43,11 +43,11 @@ Index: libc/usr/src/lib/libc/port/gen/cfmakeraw.c
 +  tio->c_cc[VMIN] = 1;
 +  tio->c_cc[VTIME] = 0;
 +}
-Index: libc/usr/src/lib/libc/amd64/Makefile
+Index: b/usr/src/lib/libc/amd64/Makefile
 ===================================================================
---- libc.orig/usr/src/lib/libc/amd64/Makefile	2014-01-23 18:06:57.758941572 +0400
-+++ libc/usr/src/lib/libc/amd64/Makefile	2014-02-02 15:57:47.618018902 +0400
-@@ -347,6 +347,7 @@
+--- a/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:24:19.256268158 +0400
++++ b/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:24:22.270360035 +0400
+@@ -349,6 +349,7 @@
  	catopen.o		\
  	cfgetispeed.o		\
  	cfgetospeed.o		\
@@ -55,11 +55,11 @@ Index: libc/usr/src/lib/libc/amd64/Makefile
  	cfree.o			\
  	cfsetispeed.o		\
  	cfsetospeed.o		\
-Index: libc/usr/src/lib/libc/i386/Makefile.com
+Index: b/usr/src/lib/libc/i386/Makefile.com
 ===================================================================
---- libc.orig/usr/src/lib/libc/i386/Makefile.com	2014-01-23 18:06:57.755031515 +0400
-+++ libc/usr/src/lib/libc/i386/Makefile.com	2014-02-02 15:57:47.617836581 +0400
-@@ -377,6 +377,7 @@
+--- a/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:24:19.254038108 +0400
++++ b/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:24:22.272594604 +0400
+@@ -379,6 +379,7 @@
  	catopen.o		\
  	cfgetispeed.o		\
  	cfgetospeed.o		\
@@ -67,11 +67,11 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com
  	cfree.o			\
  	cfsetispeed.o		\
  	cfsetospeed.o		\
-Index: libc/usr/src/lib/libc/port/mapfile-vers
+Index: b/usr/src/lib/libc/port/mapfile-vers
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/mapfile-vers	2014-01-23 18:06:57.748985793 +0400
-+++ libc/usr/src/lib/libc/port/mapfile-vers	2014-02-02 15:57:48.998591713 +0400
-@@ -92,6 +92,7 @@
+--- a/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:24:19.248906611 +0400
++++ b/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:24:22.276432312 +0400
+@@ -127,6 +127,7 @@
  
  SYMBOL_VERSION DYSON_1 {
      global:
diff --git a/libc/debian/patches/libc-add-flock.patch b/libc/debian/patches/libc-add-flock.patch
index cf67eff..6be8510 100644
--- a/libc/debian/patches/libc-add-flock.patch
+++ b/libc/debian/patches/libc-add-flock.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/lib/libc/port/sys/flock.c
+Index: b/usr/src/lib/libc/port/sys/flock.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/lib/libc/port/sys/flock.c	2013-03-04 17:35:06.976758158 +0000
++++ b/usr/src/lib/libc/port/sys/flock.c	2014-03-02 23:23:28.525201461 +0400
 @@ -0,0 +1,82 @@
 +/*
 + * CDDL HEADER START
@@ -85,11 +85,11 @@ Index: libc/usr/src/lib/libc/port/sys/flock.c
 +
 +	return (ret);
 +}
-Index: libc/usr/src/lib/libc/amd64/Makefile
+Index: b/usr/src/lib/libc/amd64/Makefile
 ===================================================================
---- libc.orig/usr/src/lib/libc/amd64/Makefile	2013-03-04 14:37:23.894187665 +0000
-+++ libc/usr/src/lib/libc/amd64/Makefile	2013-03-04 17:37:51.544314339 +0000
-@@ -184,6 +184,7 @@
+--- a/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:23:25.776578710 +0400
++++ b/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:23:28.527980233 +0400
+@@ -186,6 +186,7 @@
  	fchdir.o		\
  	fchroot.o		\
  	fdsync.o		\
@@ -97,11 +97,11 @@ Index: libc/usr/src/lib/libc/amd64/Makefile
  	fpathconf.o		\
  	fstatfs.o		\
  	fstatvfs.o		\
-Index: libc/usr/src/lib/libc/i386/Makefile.com
+Index: b/usr/src/lib/libc/i386/Makefile.com
 ===================================================================
---- libc.orig/usr/src/lib/libc/i386/Makefile.com	2013-03-04 14:38:44.424057695 +0000
-+++ libc/usr/src/lib/libc/i386/Makefile.com	2013-03-04 17:43:18.234371078 +0000
-@@ -206,6 +206,7 @@
+--- a/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:23:25.780346100 +0400
++++ b/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:23:28.530105789 +0400
+@@ -208,6 +208,7 @@
  	fchdir.o		\
  	fchroot.o		\
  	fdsync.o		\
@@ -109,11 +109,11 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com
  	fpathconf.o		\
  	fstatfs.o		\
  	fstatvfs.o		\
-Index: libc/usr/src/lib/libc/port/mapfile-vers
+Index: b/usr/src/lib/libc/port/mapfile-vers
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/mapfile-vers	2013-03-04 14:33:00.361160460 +0000
-+++ libc/usr/src/lib/libc/port/mapfile-vers	2013-03-04 17:50:46.419397534 +0000
-@@ -97,6 +97,7 @@
+--- a/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:23:22.209430365 +0400
++++ b/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:23:28.533322797 +0400
+@@ -132,6 +132,7 @@
          error_message_count;
          error_one_per_line;
          error_print_progname;
diff --git a/libc/debian/patches/libc-add-fts.patch b/libc/debian/patches/libc-add-fts.patch
index ae77849..e4703e9 100644
--- a/libc/debian/patches/libc-add-fts.patch
+++ b/libc/debian/patches/libc-add-fts.patch
@@ -1,10 +1,10 @@
 Description: implement fts_* functions, taken from FreeBSD,
  heavily patched for illumos
-Index: libc/usr/src/lib/libc/amd64/Makefile
+Index: b/usr/src/lib/libc/amd64/Makefile
 ===================================================================
---- libc.orig/usr/src/lib/libc/amd64/Makefile	2013-06-14 14:18:20.900998844 +0400
-+++ libc/usr/src/lib/libc/amd64/Makefile	2013-06-14 14:18:23.411746385 +0400
-@@ -379,6 +379,7 @@
+--- a/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:23:42.103901592 +0400
++++ b/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:24:01.562863594 +0400
+@@ -381,6 +381,7 @@
  	fmtmsg.o		\
  	ftime.o			\
  	ftok.o			\
@@ -12,11 +12,11 @@ Index: libc/usr/src/lib/libc/amd64/Makefile
  	ftw.o			\
  	gcvt.o			\
  	getauxv.o		\
-Index: libc/usr/src/lib/libc/i386/Makefile.com
+Index: b/usr/src/lib/libc/i386/Makefile.com
 ===================================================================
---- libc.orig/usr/src/lib/libc/i386/Makefile.com	2013-06-14 14:18:20.904579867 +0400
-+++ libc/usr/src/lib/libc/i386/Makefile.com	2013-06-14 14:18:23.416877059 +0400
-@@ -410,6 +410,7 @@
+--- a/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:23:42.106218703 +0400
++++ b/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:24:01.565657745 +0400
+@@ -412,6 +412,7 @@
  	fmtmsg.o		\
  	ftime.o			\
  	ftok.o			\
@@ -24,10 +24,10 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com
  	ftw.o			\
  	gcvt.o			\
  	getauxv.o		\
-Index: libc/usr/src/lib/libc/port/gen/fts.c
+Index: b/usr/src/lib/libc/port/gen/fts.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/lib/libc/port/gen/fts.c	2013-06-14 15:29:34.187051600 +0400
++++ b/usr/src/lib/libc/port/gen/fts.c	2014-03-02 23:24:01.569528242 +0400
 @@ -0,0 +1,1190 @@
 +/*-
 + * Copyright (c) 1990, 1993, 1994
@@ -1219,10 +1219,10 @@ Index: libc/usr/src/lib/libc/port/gen/fts.c
 +	}
 +	return (priv->ftsp_linksreliable);
 +}
-Index: libc/usr/src/head/fts.h
+Index: b/usr/src/head/fts.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/head/fts.h	2013-06-14 14:52:56.159791051 +0400
++++ b/usr/src/head/fts.h	2014-03-02 23:24:01.571108080 +0400
 @@ -0,0 +1,135 @@
 +/*
 + * Copyright (c) 1989, 1993
@@ -1359,10 +1359,10 @@ Index: libc/usr/src/head/fts.h
 +__END_DECLS
 +
 +#endif /* !_FTS_H_ */
-Index: libc/usr/src/head/Makefile
+Index: b/usr/src/head/Makefile
 ===================================================================
---- libc.orig/usr/src/head/Makefile	2013-06-14 14:18:18.725097690 +0400
-+++ libc/usr/src/head/Makefile	2013-06-14 14:18:23.430859550 +0400
+--- a/usr/src/head/Makefile	2014-03-02 23:23:22.193985993 +0400
++++ b/usr/src/head/Makefile	2014-03-02 23:24:01.573054777 +0400
 @@ -72,6 +72,7 @@
  	float.h		\
  	fmtmsg.h	\
@@ -1371,11 +1371,11 @@ Index: libc/usr/src/head/Makefile
  	ftw.h		\
  	gelf.h		\
  	getopt.h	\
-Index: libc/usr/src/lib/libc/port/mapfile-vers
+Index: b/usr/src/lib/libc/port/mapfile-vers
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/mapfile-vers	2013-06-14 14:18:22.235833800 +0400
-+++ libc/usr/src/lib/libc/port/mapfile-vers	2013-06-14 15:34:50.553722525 +0400
-@@ -98,6 +98,11 @@
+--- a/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:23:52.224513053 +0400
++++ b/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:24:01.576443567 +0400
+@@ -133,6 +133,11 @@
          error_one_per_line;
          error_print_progname;
          flock;
diff --git a/libc/debian/patches/libc-add-get_current_dir_name.patch b/libc/debian/patches/libc-add-get_current_dir_name.patch
index c0a2ba8..fad82db 100644
--- a/libc/debian/patches/libc-add-get_current_dir_name.patch
+++ b/libc/debian/patches/libc-add-get_current_dir_name.patch
@@ -1,11 +1,11 @@
 Description: add get_current_dir_name() - the GNU extension
  We cannot add it to getcwd.c, because libc_pic.a goes to ld.so.1
  and it gets some functions multiple defined (e. g. malloc, read)
-Index: libc/usr/src/head/unistd.h
+Index: b/usr/src/head/unistd.h
 ===================================================================
---- libc.orig/usr/src/head/unistd.h	2013-07-27 01:36:14.023987907 +0400
-+++ libc/usr/src/head/unistd.h	2013-07-27 01:37:06.411676489 +0400
-@@ -331,6 +331,9 @@
+--- a/usr/src/head/unistd.h	2014-03-02 23:23:33.560744425 +0400
++++ b/usr/src/head/unistd.h	2014-03-02 23:24:19.242793108 +0400
+@@ -336,6 +336,9 @@
  extern int ftruncate(int, off_t);
  #endif /* !defined(__XOPEN_OR_POSIX) || (_POSIX_C_SOURCE > 2)... */
  extern char *getcwd(char *, size_t);
@@ -15,11 +15,11 @@ Index: libc/usr/src/head/unistd.h
  #if !defined(__XOPEN_OR_POSIX) || (defined(_XPG4_2) && !defined(_XPG6)) || \
  	defined(__EXTENSIONS__)
  extern int getdtablesize(void);
-Index: libc/usr/src/lib/libc/port/mapfile-vers
+Index: b/usr/src/lib/libc/port/mapfile-vers
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/mapfile-vers	2013-07-27 01:36:14.024145729 +0400
-+++ libc/usr/src/lib/libc/port/mapfile-vers	2013-07-27 01:37:06.419144519 +0400
-@@ -103,6 +103,7 @@
+--- a/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:24:11.652848232 +0400
++++ b/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:24:19.248906611 +0400
+@@ -138,6 +138,7 @@
          fts_open;
          fts_read;
          fts_set;
@@ -27,10 +27,10 @@ Index: libc/usr/src/lib/libc/port/mapfile-vers
          getgrouplist;
          gnu_strerror_r;
          mempcpy;
-Index: libc/usr/src/lib/libc/port/gen/get_current_dir_name.c
+Index: b/usr/src/lib/libc/port/gen/get_current_dir_name.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/lib/libc/port/gen/get_current_dir_name.c	2013-07-27 01:45:16.551536211 +0400
++++ b/usr/src/lib/libc/port/gen/get_current_dir_name.c	2014-03-02 23:24:19.251471523 +0400
 @@ -0,0 +1,39 @@
 +
 +/*
@@ -71,11 +71,11 @@ Index: libc/usr/src/lib/libc/port/gen/get_current_dir_name.c
 +
 +  return NULL;
 +}
-Index: libc/usr/src/lib/libc/i386/Makefile.com
+Index: b/usr/src/lib/libc/i386/Makefile.com
 ===================================================================
---- libc.orig/usr/src/lib/libc/i386/Makefile.com	2013-07-27 00:57:36.971349244 +0400
-+++ libc/usr/src/lib/libc/i386/Makefile.com	2013-07-27 01:47:28.033970356 +0400
-@@ -413,6 +413,7 @@
+--- a/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:24:11.646472983 +0400
++++ b/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:24:19.254038108 +0400
+@@ -415,6 +415,7 @@
  	fts.o			\
  	ftw.o			\
  	gcvt.o			\
@@ -83,11 +83,11 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com
  	getauxv.o		\
  	getcwd.o		\
  	getdate_err.o		\
-Index: libc/usr/src/lib/libc/amd64/Makefile
+Index: b/usr/src/lib/libc/amd64/Makefile
 ===================================================================
---- libc.orig/usr/src/lib/libc/amd64/Makefile	2013-07-27 00:57:36.973818331 +0400
-+++ libc/usr/src/lib/libc/amd64/Makefile	2013-07-27 01:47:50.818022085 +0400
-@@ -383,6 +383,7 @@
+--- a/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:24:11.648948976 +0400
++++ b/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:24:19.256268158 +0400
+@@ -385,6 +385,7 @@
  	fts.o			\
  	ftw.o			\
  	gcvt.o			\
diff --git a/libc/debian/patches/libc-add-getgrouplist.patch b/libc/debian/patches/libc-add-getgrouplist.patch
index 0dad6b3..b290a13 100644
--- a/libc/debian/patches/libc-add-getgrouplist.patch
+++ b/libc/debian/patches/libc-add-getgrouplist.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/head/grp.h
+Index: b/usr/src/head/grp.h
 ===================================================================
---- libc.orig/usr/src/head/grp.h	2012-10-08 04:25:37.000000000 +0400
-+++ libc/usr/src/head/grp.h	2013-06-20 21:07:41.815300934 +0400
+--- a/usr/src/head/grp.h	2014-03-02 23:19:40.858848897 +0400
++++ b/usr/src/head/grp.h	2014-03-02 23:24:04.750233289 +0400
 @@ -54,6 +54,10 @@
  
  #if defined(__STDC__)
@@ -13,11 +13,11 @@ Index: libc/usr/src/head/grp.h
  extern struct group *getgrgid(gid_t);		/* MT-unsafe */
  extern struct group *getgrnam(const char *);	/* MT-unsafe */
  
-Index: libc/usr/src/lib/libc/amd64/Makefile
+Index: b/usr/src/lib/libc/amd64/Makefile
 ===================================================================
---- libc.orig/usr/src/lib/libc/amd64/Makefile	2013-06-20 21:07:41.515910075 +0400
-+++ libc/usr/src/lib/libc/amd64/Makefile	2013-06-20 21:07:41.820139491 +0400
-@@ -194,6 +194,7 @@
+--- a/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:24:01.562863594 +0400
++++ b/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:24:04.753022180 +0400
+@@ -196,6 +196,7 @@
  	getegid.o		\
  	geteuid.o		\
  	getgid.o		\
@@ -25,11 +25,11 @@ Index: libc/usr/src/lib/libc/amd64/Makefile
  	getgroups.o		\
  	gethrtime.o		\
  	getitimer.o		\
-Index: libc/usr/src/lib/libc/i386/Makefile.com
+Index: b/usr/src/lib/libc/i386/Makefile.com
 ===================================================================
---- libc.orig/usr/src/lib/libc/i386/Makefile.com	2013-06-20 21:07:41.519864117 +0400
-+++ libc/usr/src/lib/libc/i386/Makefile.com	2013-06-20 21:07:41.823452441 +0400
-@@ -421,6 +421,7 @@
+--- a/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:24:01.565657745 +0400
++++ b/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:24:04.755118425 +0400
+@@ -423,6 +423,7 @@
  	getexecname.o		\
  	getgrnam.o		\
  	getgrnam_r.o		\
@@ -37,10 +37,10 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com
  	gethostid.o		\
  	gethostname.o		\
  	gethz.o			\
-Index: libc/usr/src/lib/libc/port/gen/getgrouplist.c
+Index: b/usr/src/lib/libc/port/gen/getgrouplist.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/lib/libc/port/gen/getgrouplist.c	2013-06-20 21:07:41.826349451 +0400
++++ b/usr/src/lib/libc/port/gen/getgrouplist.c	2014-03-02 23:24:04.758923273 +0400
 @@ -0,0 +1,89 @@
 +/*  $OpenBSD: getgrouplist.c,v 1.12 2005/08/08 08:05:34 espie Exp $ */
 +/*
@@ -131,11 +131,11 @@ Index: libc/usr/src/lib/libc/port/gen/getgrouplist.c
 +    *grpcnt = ngroups;
 +    return (ret);
 +}
-Index: libc/usr/src/lib/libc/port/mapfile-vers
+Index: b/usr/src/lib/libc/port/mapfile-vers
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/mapfile-vers	2013-06-20 21:07:41.536881600 +0400
-+++ libc/usr/src/lib/libc/port/mapfile-vers	2013-06-20 21:15:48.743218753 +0400
-@@ -103,6 +103,7 @@
+--- a/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:24:01.576443567 +0400
++++ b/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:24:04.762510308 +0400
+@@ -138,6 +138,7 @@
          fts_open;
          fts_read;
          fts_set;
diff --git a/libc/debian/patches/libc-add-gnu-strerror_r.patch b/libc/debian/patches/libc-add-gnu-strerror_r.patch
index 8e7736f..04f40f0 100644
--- a/libc/debian/patches/libc-add-gnu-strerror_r.patch
+++ b/libc/debian/patches/libc-add-gnu-strerror_r.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/lib/libc/port/gen/strerror.c
+Index: b/usr/src/lib/libc/port/gen/strerror.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/gen/strerror.c	2013-03-08 15:52:02.100462790 +0000
-+++ libc/usr/src/lib/libc/port/gen/strerror.c	2013-03-08 16:18:12.178735452 +0000
+--- a/usr/src/lib/libc/port/gen/strerror.c	2014-03-02 23:19:44.988869003 +0400
++++ b/usr/src/lib/libc/port/gen/strerror.c	2014-03-02 23:23:52.220526843 +0400
 @@ -31,6 +31,7 @@
  
  #include "lint.h"
@@ -25,11 +25,11 @@ Index: libc/usr/src/lib/libc/port/gen/strerror.c
 +    }
 +    return _libc_gettext((char *)&_sys_errs[_sys_index[errnum]]);
 +}
-Index: libc/usr/src/lib/libc/port/mapfile-vers
+Index: b/usr/src/lib/libc/port/mapfile-vers
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/mapfile-vers	2013-03-08 11:13:58.650560001 +0000
-+++ libc/usr/src/lib/libc/port/mapfile-vers	2013-03-08 16:19:02.950245784 +0000
-@@ -98,6 +98,7 @@
+--- a/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:23:47.357714047 +0400
++++ b/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:23:52.224513053 +0400
+@@ -133,6 +133,7 @@
          error_one_per_line;
          error_print_progname;
          flock;
@@ -37,10 +37,10 @@ Index: libc/usr/src/lib/libc/port/mapfile-vers
          mempcpy;
          memrchr;
          program_invocation_name;
-Index: libc/usr/src/head/string.h
+Index: b/usr/src/head/string.h
 ===================================================================
---- libc.orig/usr/src/head/string.h	2013-03-08 01:36:30.330472304 +0000
-+++ libc/usr/src/head/string.h	2013-03-08 16:22:30.633485968 +0000
+--- a/usr/src/head/string.h	2014-03-02 23:23:38.875993767 +0400
++++ b/usr/src/head/string.h	2014-03-02 23:23:52.227049043 +0400
 @@ -70,7 +70,14 @@
  #if defined(__EXTENSIONS__) || \
  	(!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX)) || \
diff --git a/libc/debian/patches/libc-add-mempcpy.patch b/libc/debian/patches/libc-add-mempcpy.patch
index f3ff60b..e7b1a0c 100644
--- a/libc/debian/patches/libc-add-mempcpy.patch
+++ b/libc/debian/patches/libc-add-mempcpy.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/head/string.h
+Index: b/usr/src/head/string.h
 ===================================================================
---- libc.orig/usr/src/head/string.h	2012-10-08 00:25:37.000000000 +0000
-+++ libc/usr/src/head/string.h	2013-03-05 22:43:27.902479355 +0000
+--- a/usr/src/head/string.h	2014-03-02 23:19:59.440731856 +0400
++++ b/usr/src/head/string.h	2014-03-02 23:23:14.072577470 +0400
 @@ -123,6 +123,11 @@
  extern char *strdup(const char *);
  #endif
@@ -14,11 +14,11 @@ Index: libc/usr/src/head/string.h
  #if defined(__EXTENSIONS__) || \
  	(!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX))
  #if defined(__GNUC__)
-Index: libc/usr/src/lib/libc/amd64/Makefile
+Index: b/usr/src/lib/libc/amd64/Makefile
 ===================================================================
---- libc.orig/usr/src/lib/libc/amd64/Makefile	2013-03-04 14:31:04.374782082 +0000
-+++ libc/usr/src/lib/libc/amd64/Makefile	2013-03-05 22:41:27.695497583 +0000
-@@ -443,6 +443,7 @@
+--- a/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:21:11.104864140 +0400
++++ b/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:23:14.075980473 +0400
+@@ -445,6 +445,7 @@
  	malloc.o		\
  	memalign.o		\
  	memmem.o		\
@@ -26,11 +26,11 @@ Index: libc/usr/src/lib/libc/amd64/Makefile
  	mkdev.o			\
  	mkdtemp.o		\
  	mkfifo.o		\
-Index: libc/usr/src/lib/libc/i386/Makefile.com
+Index: b/usr/src/lib/libc/i386/Makefile.com
 ===================================================================
---- libc.orig/usr/src/lib/libc/i386/Makefile.com	2013-03-04 14:31:04.372200969 +0000
-+++ libc/usr/src/lib/libc/i386/Makefile.com	2013-03-05 22:41:27.695478904 +0000
-@@ -474,6 +474,7 @@
+--- a/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:21:11.102603112 +0400
++++ b/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:23:14.078098711 +0400
+@@ -476,6 +476,7 @@
  	malloc.o		\
  	memalign.o		\
  	memmem.o		\
@@ -38,10 +38,10 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com
  	mkdev.o			\
  	mkdtemp.o		\
  	mkfifo.o		\
-Index: libc/usr/src/lib/libc/port/gen/mempcpy.c
+Index: b/usr/src/lib/libc/port/gen/mempcpy.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/lib/libc/port/gen/mempcpy.c	2013-03-04 14:31:16.154719968 +0000
++++ b/usr/src/lib/libc/port/gen/mempcpy.c	2014-03-02 23:23:14.079909698 +0400
 @@ -0,0 +1,8 @@
 +
 +#include<string.h>
@@ -51,13 +51,13 @@ Index: libc/usr/src/lib/libc/port/gen/mempcpy.c
 +    return (char *)memcpy(dest, src, n) + n;
 +}
 +
-Index: libc/usr/src/lib/libc/port/mapfile-vers
+Index: b/usr/src/lib/libc/port/mapfile-vers
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/mapfile-vers	2012-10-08 00:25:38.000000000 +0000
-+++ libc/usr/src/lib/libc/port/mapfile-vers	2013-03-05 22:41:27.695445939 +0000
-@@ -90,6 +90,11 @@
- $add amd64
+--- a/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:19:59.440981750 +0400
++++ b/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:23:14.083377278 +0400
+@@ -125,6 +125,11 @@
  $endif
+ } ILLUMOS_0.3;
  
 +SYMBOL_VERSION DYSON_1 {
 +    global:
diff --git a/libc/debian/patches/libc-add-mkostemp.patch b/libc/debian/patches/libc-add-mkostemp.patch
index a998c7c..c5e722a 100644
--- a/libc/debian/patches/libc-add-mkostemp.patch
+++ b/libc/debian/patches/libc-add-mkostemp.patch
@@ -1,70 +1,24 @@
-Index: libc/usr/src/lib/libc/port/gen/mkstemp.c
+Index: b/usr/src/lib/libc/port/mapfile-vers
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/gen/mkstemp.c	2012-10-08 04:25:38.000000000 +0400
-+++ libc/usr/src/lib/libc/port/gen/mkstemp.c	2014-02-12 15:07:17.078247281 +0400
-@@ -40,6 +40,8 @@
- #if !defined(_LP64) && _FILE_OFFSET_BITS == 64
- #define	mkstemp		mkstemp64
- #define	mkstemps	mkstemps64
-+#define	mkostemp	mkostemp64
-+#define	mkostemps	mkostemps64
- #define	libc_mkstemps	libc_mkstemps64		/* prefer unique statics */
- #pragma weak _mkstemp64 = mkstemp64
- #else
-@@ -59,7 +61,7 @@
- extern char *libc_mktemps(char *, int);
+--- a/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:24:53.941324987 +0400
++++ b/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:24:57.222356447 +0400
+@@ -116,14 +116,7 @@
+     protected:
+         pipe2;
+         dup3;
+-        mkostemp;
+-        mkostemps;
+-
+-$if lf64
+-        mkostemp64;
+-        mkostemps64;
+-$endif
+-} ILLUMOS_0.3;
++} DYSON_1;
  
- static int
--libc_mkstemps(char *as, int slen)
-+libc_mkstemps(char *as, int slen, int flags)
- {
- 	int	fd;
- 	int	len;
-@@ -91,11 +93,11 @@
- 			}
- 		}
- #if _FILE_OFFSET_BITS == 64
--		if ((fd = open64(as, O_CREAT|O_EXCL|O_RDWR, 0600)) != -1) {
-+		if ((fd = open64(as, O_CREAT|O_EXCL|O_RDWR|flags, 0600)) != -1) {
- 			return (fd);
- 		}
- #else
--		if ((fd = open(as, O_CREAT|O_EXCL|O_RDWR, 0600)) != -1) {
-+		if ((fd = open(as, O_CREAT|O_EXCL|O_RDWR|flags, 0600)) != -1) {
- 			return (fd);
- 		}
- #endif  /* _FILE_OFFSET_BITS == 64 */
-@@ -116,11 +118,23 @@
- int
- mkstemp(char *as)
- {
--	return (libc_mkstemps(as, 0));
-+	return (libc_mkstemps(as, 0, 0));
- }
- 
- int
- mkstemps(char *as, int slen)
- {
--	return (libc_mkstemps(as, slen));
-+	return (libc_mkstemps(as, slen, 0));
-+}
-+
-+int
-+mkostemp(char *as, int flags)
-+{
-+	return (libc_mkstemps(as, 0, flags));
-+}
-+
-+int
-+mkostemps(char *as, int slen, int flags)
-+{
-+	return (libc_mkstemps(as, slen, flags));
- }
-Index: libc/usr/src/lib/libc/port/mapfile-vers
-===================================================================
---- libc.orig/usr/src/lib/libc/port/mapfile-vers	2014-02-12 14:22:27.748474348 +0400
-+++ libc/usr/src/lib/libc/port/mapfile-vers	2014-02-12 15:19:18.575317264 +0400
-@@ -110,6 +110,8 @@
+ SYMBOL_VERSION DYSON_1 {
+     global:
+@@ -145,6 +138,8 @@
          gnu_strerror_r;
          mempcpy;
          memrchr;
@@ -73,7 +27,7 @@ Index: libc/usr/src/lib/libc/port/mapfile-vers
          program_invocation_name;
          program_invocation_short_name;
          qsort_r;
-@@ -117,6 +119,8 @@
+@@ -152,6 +147,8 @@
          sendfile;
          sendfilev;
  $if _ELF32
@@ -82,11 +36,11 @@ Index: libc/usr/src/lib/libc/port/mapfile-vers
          sendfile64;
          sendfilev64;
  $endif
-Index: libc/usr/src/head/stdlib.h
+Index: b/usr/src/head/stdlib.h
 ===================================================================
---- libc.orig/usr/src/head/stdlib.h	2014-02-12 14:33:03.293978876 +0400
-+++ libc/usr/src/head/stdlib.h	2014-02-12 17:46:39.040994870 +0400
-@@ -98,9 +98,17 @@
+--- a/usr/src/head/stdlib.h	2014-03-02 23:24:53.949923251 +0400
++++ b/usr/src/head/stdlib.h	2014-03-02 23:24:57.224298130 +0400
+@@ -102,9 +102,17 @@
  #ifdef	__PRAGMA_REDEFINE_EXTNAME
  #pragma redefine_extname	mkstemp		mkstemp64
  #pragma redefine_extname	mkstemps	mkstemps64
@@ -104,7 +58,7 @@ Index: libc/usr/src/head/stdlib.h
  #endif	/* __PRAGMA_REDEFINE_EXTNAME */
  
  #endif	/* _FILE_OFFSET_BITS == 64 */
-@@ -111,9 +119,17 @@
+@@ -115,9 +123,17 @@
  #ifdef	__PRAGMA_REDEFINE_EXTNAME
  #pragma redefine_extname	mkstemp64	mkstemp
  #pragma redefine_extname	mkstemps64	mkstemps
@@ -122,7 +76,7 @@ Index: libc/usr/src/head/stdlib.h
  #endif	/* __PRAGMA_REDEFINE_EXTNAME */
  
  #endif	/* _LP64 && _LARGEFILE64_SOURCE */
-@@ -172,6 +188,10 @@
+@@ -176,6 +192,10 @@
  #if !defined(_XPG4_2) || defined(__EXTENSIONS__)
  extern int	mkstemps(char *, int);
  #endif
@@ -133,7 +87,7 @@ Index: libc/usr/src/head/stdlib.h
  #endif /* defined(__EXTENSIONS__) ... */
  
  #if	defined(_LARGEFILE64_SOURCE) && !((_FILE_OFFSET_BITS == 64) && \
-@@ -180,6 +200,10 @@
+@@ -184,6 +204,10 @@
  #if !defined(_XPG4_2) || defined(__EXTENSIONS__)
  extern int	mkstemps64(char *, int);
  #endif
diff --git a/libc/debian/patches/libc-add-qsort_r.patch b/libc/debian/patches/libc-add-qsort_r.patch
index 6d4cbf4..4a932e5 100644
--- a/libc/debian/patches/libc-add-qsort_r.patch
+++ b/libc/debian/patches/libc-add-qsort_r.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/common/util/qsort.c
+Index: b/usr/src/common/util/qsort.c
 ===================================================================
---- libc.orig/usr/src/common/util/qsort.c	2012-10-08 04:25:35.000000000 +0400
-+++ libc/usr/src/common/util/qsort.c	2014-02-12 14:38:05.106534948 +0400
+--- a/usr/src/common/util/qsort.c	2014-03-02 23:19:25.516020281 +0400
++++ b/usr/src/common/util/qsort.c	2014-03-02 23:24:53.936886596 +0400
 @@ -50,9 +50,15 @@
   * note: cstyle specifically prohibits nested conditional operators
   * but this is the only way to do the median of 3 function in-line
@@ -79,11 +79,11 @@ Index: libc/usr/src/common/util/qsort.c
  				if (cv < 0) {
  					break;
  				}
-Index: libc/usr/src/lib/libc/port/mapfile-vers
+Index: b/usr/src/lib/libc/port/mapfile-vers
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/mapfile-vers	2014-02-11 18:13:28.206721631 +0400
-+++ libc/usr/src/lib/libc/port/mapfile-vers	2014-02-12 14:22:27.748474348 +0400
-@@ -112,6 +112,7 @@
+--- a/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:24:41.444344258 +0400
++++ b/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:24:53.941324987 +0400
+@@ -147,6 +147,7 @@
          memrchr;
          program_invocation_name;
          program_invocation_short_name;
@@ -91,11 +91,11 @@ Index: libc/usr/src/lib/libc/port/mapfile-vers
          rawmemchr;
          sendfile;
          sendfilev;
-Index: libc/usr/src/lib/libc/i386/Makefile.com
+Index: b/usr/src/lib/libc/i386/Makefile.com
 ===================================================================
---- libc.orig/usr/src/lib/libc/i386/Makefile.com	2014-02-11 18:13:28.690471610 +0400
-+++ libc/usr/src/lib/libc/i386/Makefile.com	2014-02-12 14:26:16.611252924 +0400
-@@ -94,6 +94,7 @@
+--- a/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:24:43.817337941 +0400
++++ b/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:24:53.944783778 +0400
+@@ -96,6 +96,7 @@
  	bsearch.o		\
  	bzero.o			\
  	qsort.o			\
@@ -103,18 +103,18 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com
  	strtol.o		\
  	strtoul.o		\
  	strtoll.o		\
-Index: libc/usr/src/common/util/qsort_r.c
+Index: b/usr/src/common/util/qsort_r.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/common/util/qsort_r.c	2014-02-12 14:28:36.014096511 +0400
++++ b/usr/src/common/util/qsort_r.c	2014-03-02 23:24:53.946009441 +0400
 @@ -0,0 +1,2 @@
 +#define QSORT_R
 +#include "qsort.c"
-Index: libc/usr/src/lib/libc/amd64/Makefile
+Index: b/usr/src/lib/libc/amd64/Makefile
 ===================================================================
---- libc.orig/usr/src/lib/libc/amd64/Makefile	2014-02-11 18:13:28.686562681 +0400
-+++ libc/usr/src/lib/libc/amd64/Makefile	2014-02-12 14:29:18.334059694 +0400
-@@ -93,6 +93,7 @@
+--- a/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:24:43.814945646 +0400
++++ b/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:24:53.947847452 +0400
+@@ -95,6 +95,7 @@
  	bsearch.o		\
  	bzero.o			\
  	qsort.o			\
@@ -122,11 +122,11 @@ Index: libc/usr/src/lib/libc/amd64/Makefile
  	strtol.o		\
  	strtoul.o		\
  	strtoll.o		\
-Index: libc/usr/src/head/stdlib.h
+Index: b/usr/src/head/stdlib.h
 ===================================================================
---- libc.orig/usr/src/head/stdlib.h	2014-02-11 18:13:21.703678719 +0400
-+++ libc/usr/src/head/stdlib.h	2014-02-12 14:33:03.293978876 +0400
-@@ -29,6 +29,8 @@
+--- a/usr/src/head/stdlib.h	2014-03-02 23:23:31.363268917 +0400
++++ b/usr/src/head/stdlib.h	2014-03-02 23:24:53.949923251 +0400
+@@ -33,6 +33,8 @@
  #ifndef _STDLIB_H
  #define	_STDLIB_H
  
@@ -135,7 +135,7 @@ Index: libc/usr/src/head/stdlib.h
  #include <iso/stdlib_iso.h>
  #include <iso/stdlib_c99.h>
  
-@@ -248,6 +250,10 @@
+@@ -266,6 +268,10 @@
  
  #endif /* defined(__EXTENSIONS__) || !defined(_STRICT_STDC) ... */
  
@@ -145,4 +145,4 @@ Index: libc/usr/src/head/stdlib.h
 +
  #else /* not __STDC__ */
  
- #if defined(__EXTENSIONS__) || !defined(_XOPEN_OR_POSIX) || \
+ #if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) || \
diff --git a/libc/debian/patches/libc-add-sig_t.patch b/libc/debian/patches/libc-add-sig_t.patch
index 75d7329..2224f3b 100644
--- a/libc/debian/patches/libc-add-sig_t.patch
+++ b/libc/debian/patches/libc-add-sig_t.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/head/signal.h
+Index: b/usr/src/head/signal.h
 ===================================================================
---- libc.orig/usr/src/head/signal.h	2012-10-08 04:25:37.000000000 +0400
-+++ libc/usr/src/head/signal.h	2013-06-04 22:18:27.492649894 +0400
+--- a/usr/src/head/signal.h	2014-03-02 23:19:42.687024948 +0400
++++ b/usr/src/head/signal.h	2014-03-02 23:23:59.247170157 +0400
 @@ -33,7 +33,7 @@
  
  #pragma ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.5.3.4 */
diff --git a/libc/debian/patches/libc-add-tdestroy.patch b/libc/debian/patches/libc-add-tdestroy.patch
index 919696f..e655bb7 100644
--- a/libc/debian/patches/libc-add-tdestroy.patch
+++ b/libc/debian/patches/libc-add-tdestroy.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/head/search.h
+Index: b/usr/src/head/search.h
 ===================================================================
---- libc.orig/usr/src/head/search.h	2012-10-08 00:25:37.000000000 +0000
-+++ libc/usr/src/head/search.h	2013-03-08 11:13:30.815717162 +0000
+--- a/usr/src/head/search.h	2014-03-02 23:19:46.698345709 +0400
++++ b/usr/src/head/search.h	2014-03-02 23:23:47.353839086 +0400
 @@ -33,7 +33,7 @@
  
  #pragma ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.3.1.11 */
@@ -22,11 +22,11 @@ Index: libc/usr/src/head/search.h
  #if defined(__STDC__)
  
  #if defined(__EXTENSIONS__) || !defined(_XOPEN_SOURCE)
-Index: libc/usr/src/lib/libc/port/mapfile-vers
+Index: b/usr/src/lib/libc/port/mapfile-vers
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/mapfile-vers	2013-03-08 01:39:07.046108962 +0000
-+++ libc/usr/src/lib/libc/port/mapfile-vers	2013-03-08 11:13:58.650560001 +0000
-@@ -103,6 +103,7 @@
+--- a/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:23:42.101549625 +0400
++++ b/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:23:47.357714047 +0400
+@@ -138,6 +138,7 @@
          program_invocation_name;
          program_invocation_short_name;
          rawmemchr;
@@ -34,10 +34,10 @@ Index: libc/usr/src/lib/libc/port/mapfile-vers
          wmempcpy;
  } ILLUMOS_0.3;
  
-Index: libc/usr/src/lib/libc/port/gen/tsearch.c
+Index: b/usr/src/lib/libc/port/gen/tsearch.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/gen/tsearch.c	2012-10-08 00:25:38.000000000 +0000
-+++ libc/usr/src/lib/libc/port/gen/tsearch.c	2013-03-08 12:17:00.820556198 +0000
+--- a/usr/src/lib/libc/port/gen/tsearch.c	2014-03-02 23:19:46.698426470 +0400
++++ b/usr/src/lib/libc/port/gen/tsearch.c	2014-03-02 23:23:47.359824066 +0400
 @@ -156,3 +156,23 @@
  		(*action)(root, endorder, level);
  	}
diff --git a/libc/debian/patches/libc-add-wmempcpy.patch b/libc/debian/patches/libc-add-wmempcpy.patch
index 99684fd..f2bdf60 100644
--- a/libc/debian/patches/libc-add-wmempcpy.patch
+++ b/libc/debian/patches/libc-add-wmempcpy.patch
@@ -1,8 +1,8 @@
-Index: libc/usr/src/head/wchar.h
+Index: b/usr/src/head/wchar.h
 ===================================================================
---- libc.orig/usr/src/head/wchar.h	2012-10-08 00:25:37.000000000 +0000
-+++ libc/usr/src/head/wchar.h	2013-03-08 01:38:27.402528598 +0000
-@@ -190,6 +190,10 @@
+--- a/usr/src/head/wchar.h	2014-03-02 23:19:48.530557052 +0400
++++ b/usr/src/head/wchar.h	2014-03-02 23:23:42.097058740 +0400
+@@ -215,6 +215,10 @@
  
  #endif /* __STDC__ */
  
@@ -13,11 +13,11 @@ Index: libc/usr/src/head/wchar.h
  #ifdef	__cplusplus
  }
  #endif
-Index: libc/usr/src/lib/libc/port/mapfile-vers
+Index: b/usr/src/lib/libc/port/mapfile-vers
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/mapfile-vers	2013-03-07 16:49:22.030855670 +0000
-+++ libc/usr/src/lib/libc/port/mapfile-vers	2013-03-08 01:39:07.046108962 +0000
-@@ -103,6 +103,7 @@
+--- a/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:23:38.869042820 +0400
++++ b/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:23:42.101549625 +0400
+@@ -138,6 +138,7 @@
          program_invocation_name;
          program_invocation_short_name;
          rawmemchr;
@@ -25,11 +25,11 @@ Index: libc/usr/src/lib/libc/port/mapfile-vers
  } ILLUMOS_0.3;
  
  SYMBOL_VERSION ILLUMOS_0.3 {	# Illumos additions
-Index: libc/usr/src/lib/libc/amd64/Makefile
+Index: b/usr/src/lib/libc/amd64/Makefile
 ===================================================================
---- libc.orig/usr/src/lib/libc/amd64/Makefile	2013-03-07 16:49:22.026209778 +0000
-+++ libc/usr/src/lib/libc/amd64/Makefile	2013-03-08 01:39:45.545204165 +0000
-@@ -671,6 +671,7 @@
+--- a/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:23:38.864909746 +0400
++++ b/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:23:42.103901592 +0400
+@@ -674,6 +674,7 @@
  	wmemcmp.o		\
  	wmemcpy.o		\
  	wmemmove.o		\
@@ -37,11 +37,11 @@ Index: libc/usr/src/lib/libc/amd64/Makefile
  	wmemset.o		\
  	wscasecmp.o		\
  	wscat.o			\
-Index: libc/usr/src/lib/libc/i386/Makefile.com
+Index: b/usr/src/lib/libc/i386/Makefile.com
 ===================================================================
---- libc.orig/usr/src/lib/libc/i386/Makefile.com	2013-03-07 16:49:22.035261818 +0000
-+++ libc/usr/src/lib/libc/i386/Makefile.com	2013-03-08 01:39:59.705698527 +0000
-@@ -712,6 +712,7 @@
+--- a/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:23:38.872441557 +0400
++++ b/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:23:42.106218703 +0400
+@@ -715,6 +715,7 @@
  	wmemchr.o		\
  	wmemcmp.o		\
  	wmemcpy.o		\
@@ -49,10 +49,10 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com
  	wmemmove.o		\
  	wmemset.o		\
  	wscasecmp.o		\
-Index: libc/usr/src/lib/libc/port/i18n/wmempcpy.c
+Index: b/usr/src/lib/libc/port/i18n/wmempcpy.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/lib/libc/port/i18n/wmempcpy.c	2013-03-08 01:46:38.200502332 +0000
++++ b/usr/src/lib/libc/port/i18n/wmempcpy.c	2014-03-02 23:23:42.107795924 +0400
 @@ -0,0 +1,7 @@
 +#include <wchar.h>
 +
diff --git a/libc/debian/patches/libc-conf-PATH.patch b/libc/debian/patches/libc-conf-PATH.patch
index 6cd5ea0..65205e9 100644
--- a/libc/debian/patches/libc-conf-PATH.patch
+++ b/libc/debian/patches/libc-conf-PATH.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/lib/libc/port/gen/confstr.c
+Index: b/usr/src/lib/libc/port/gen/confstr.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/gen/confstr.c	2012-10-08 00:25:38.000000000 +0000
-+++ libc/usr/src/lib/libc/port/gen/confstr.c	2012-11-12 22:39:05.266183937 +0000
+--- a/usr/src/lib/libc/port/gen/confstr.c	2014-03-02 23:20:03.664745341 +0400
++++ b/usr/src/lib/libc/port/gen/confstr.c	2014-03-02 23:22:53.163783462 +0400
 @@ -101,13 +101,7 @@
  	/* Keep _CS_PATH in sync with execvp.c */
  
diff --git a/libc/debian/patches/libc-enable-xpg6.patch b/libc/debian/patches/libc-enable-xpg6.patch
index 6e656e0..bd2c020 100644
--- a/libc/debian/patches/libc-enable-xpg6.patch
+++ b/libc/debian/patches/libc-enable-xpg6.patch
@@ -1,8 +1,8 @@
 Description: Enable XPG6 (C99) by default.
-Index: libc/usr/src/lib/libc/port/gen/xpg6.c
+Index: b/usr/src/lib/libc/port/gen/xpg6.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/gen/xpg6.c	2012-10-08 04:25:38.000000000 +0400
-+++ libc/usr/src/lib/libc/port/gen/xpg6.c	2013-07-21 19:12:28.837577916 +0400
+--- a/usr/src/lib/libc/port/gen/xpg6.c	2014-03-02 23:19:37.686694256 +0400
++++ b/usr/src/lib/libc/port/gen/xpg6.c	2014-03-02 23:24:14.529676310 +0400
 @@ -49,6 +49,6 @@
  
  #include "xpg6.h"
@@ -11,10 +11,10 @@ Index: libc/usr/src/lib/libc/port/gen/xpg6.c
 +unsigned int __xpg6 = _C99SUSv3_mode_ON;
  
  unsigned int libc__xpg6;	/* copy of __xpg6, private to libc */
-Index: libc/usr/src/lib/libc/port/gen/xpg4.c
+Index: b/usr/src/lib/libc/port/gen/xpg4.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/gen/xpg4.c	2012-10-08 04:25:38.000000000 +0400
-+++ libc/usr/src/lib/libc/port/gen/xpg4.c	2013-07-21 20:42:29.162423331 +0400
+--- a/usr/src/lib/libc/port/gen/xpg4.c	2014-03-02 23:19:37.686786191 +0400
++++ b/usr/src/lib/libc/port/gen/xpg4.c	2014-03-02 23:24:14.531591641 +0400
 @@ -24,15 +24,6 @@
   * Use is subject to license terms.
   */
diff --git a/libc/debian/patches/libc-futimes.patch b/libc/debian/patches/libc-futimes.patch
index 8db64bd..109d12f 100644
--- a/libc/debian/patches/libc-futimes.patch
+++ b/libc/debian/patches/libc-futimes.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/lib/libc/port/sys/utimesys.c
+Index: b/usr/src/lib/libc/port/sys/utimesys.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/sys/utimesys.c	2012-10-08 04:25:38.000000000 +0400
-+++ libc/usr/src/lib/libc/port/sys/utimesys.c	2014-02-07 10:25:27.951666995 +0400
+--- a/usr/src/lib/libc/port/sys/utimesys.c	2014-03-02 23:19:29.527001814 +0400
++++ b/usr/src/lib/libc/port/sys/utimesys.c	2014-03-02 23:24:41.440326997 +0400
 @@ -38,6 +38,24 @@
  	return (syscall(SYS_utimesys, 0, fd, times));
  }
@@ -27,11 +27,11 @@ Index: libc/usr/src/lib/libc/port/sys/utimesys.c
  int
  utimensat(int fd, const char *path, const timespec_t times[2], int flag)
  {
-Index: libc/usr/src/lib/libc/port/mapfile-vers
+Index: b/usr/src/lib/libc/port/mapfile-vers
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/mapfile-vers	2014-02-04 17:19:00.144298378 +0400
-+++ libc/usr/src/lib/libc/port/mapfile-vers	2014-02-04 17:19:01.986018156 +0400
-@@ -104,6 +104,7 @@
+--- a/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:24:22.276432312 +0400
++++ b/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:24:41.444344258 +0400
+@@ -139,6 +139,7 @@
          fts_open;
          fts_read;
          fts_set;
diff --git a/libc/debian/patches/libc-include-time.h.patch b/libc/debian/patches/libc-include-time.h.patch
index 9b634e1..a684708 100644
--- a/libc/debian/patches/libc-include-time.h.patch
+++ b/libc/debian/patches/libc-include-time.h.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/lib/libc/port/gen/waitpid.c
+Index: b/usr/src/lib/libc/port/gen/waitpid.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/gen/waitpid.c	2012-10-08 00:25:38.000000000 +0000
-+++ libc/usr/src/lib/libc/port/gen/waitpid.c	2012-11-14 22:00:08.090866664 +0000
+--- a/usr/src/lib/libc/port/gen/waitpid.c	2014-03-02 23:20:02.495047876 +0400
++++ b/usr/src/lib/libc/port/gen/waitpid.c	2014-03-02 23:22:58.980666619 +0400
 @@ -42,6 +42,7 @@
  #include <wait.h>
  #include <sys/types.h>
@@ -10,10 +10,10 @@ Index: libc/usr/src/lib/libc/port/gen/waitpid.c
  #include <sys/times.h>
  #include <sys/resource.h>
  
-Index: libc/usr/src/lib/libc/port/locale/strftime.c
+Index: b/usr/src/lib/libc/port/locale/strftime.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/locale/strftime.c	2012-10-08 00:25:38.000000000 +0000
-+++ libc/usr/src/lib/libc/port/locale/strftime.c	2012-11-14 22:02:22.411827071 +0000
+--- a/usr/src/lib/libc/port/locale/strftime.c	2014-03-02 23:20:02.494956593 +0400
++++ b/usr/src/lib/libc/port/locale/strftime.c	2014-03-02 23:22:58.984284004 +0400
 @@ -22,6 +22,7 @@
  #include <sys/stat.h>
  #include <string.h>
diff --git a/libc/debian/patches/libc-nvpair.h.patch b/libc/debian/patches/libc-nvpair.h.patch
index 642e868..9ec7a64 100644
--- a/libc/debian/patches/libc-nvpair.h.patch
+++ b/libc/debian/patches/libc-nvpair.h.patch
@@ -1,8 +1,8 @@
 Description: don't depend on libnvpair
-Index: libc/usr/src/lib/libc/inc/libc.h
+Index: b/usr/src/lib/libc/inc/libc.h
 ===================================================================
---- libc.orig/usr/src/lib/libc/inc/libc.h	2012-10-08 04:25:38.000000000 +0400
-+++ libc/usr/src/lib/libc/inc/libc.h	2013-01-07 20:06:29.124705085 +0400
+--- a/usr/src/lib/libc/inc/libc.h	2014-03-02 23:20:07.220885436 +0400
++++ b/usr/src/lib/libc/inc/libc.h	2014-03-02 23:22:39.069538124 +0400
 @@ -49,7 +49,7 @@
  #include <stdarg.h>
  #include <wchar.h>
@@ -12,10 +12,10 @@ Index: libc/usr/src/lib/libc/inc/libc.h
  
  #ifdef	__cplusplus
  extern "C" {
-Index: libc/usr/src/lib/libc/port/gen/attrat.c
+Index: b/usr/src/lib/libc/port/gen/attrat.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/gen/attrat.c	2012-10-08 04:25:38.000000000 +0400
-+++ libc/usr/src/lib/libc/port/gen/attrat.c	2013-01-07 20:04:33.612716187 +0400
+--- a/usr/src/lib/libc/port/gen/attrat.c	2014-03-02 23:20:07.221067028 +0400
++++ b/usr/src/lib/libc/port/gen/attrat.c	2014-03-02 23:22:39.072272228 +0400
 @@ -40,6 +40,10 @@
  #include <stdio.h>
  #include <atomic.h>
diff --git a/libc/debian/patches/libc-printf-q-length-modifier.patch b/libc/debian/patches/libc-printf-q-length-modifier.patch
index 1a5bb9d..2c84d25 100644
--- a/libc/debian/patches/libc-printf-q-length-modifier.patch
+++ b/libc/debian/patches/libc-printf-q-length-modifier.patch
@@ -1,9 +1,9 @@
 Description: adds support for printf("%qx...")
  makes hexdump from bsdmainutils work
-Index: libc/usr/src/lib/libc/port/print/doprnt.c
+Index: b/usr/src/lib/libc/port/print/doprnt.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/print/doprnt.c	2012-10-08 04:25:38.000000000 +0400
-+++ libc/usr/src/lib/libc/port/print/doprnt.c	2014-02-11 18:09:20.381693858 +0400
+--- a/usr/src/lib/libc/port/print/doprnt.c	2014-03-02 23:19:26.095568679 +0400
++++ b/usr/src/lib/libc/port/print/doprnt.c	2014-03-02 23:24:51.612563055 +0400
 @@ -862,6 +862,14 @@
  			lflag++;
  			goto charswitch;
diff --git a/libc/debian/patches/libc-regex.h-define-REG_NOERROR.patch b/libc/debian/patches/libc-regex.h-define-REG_NOERROR.patch
index e71b901..10a9225 100644
--- a/libc/debian/patches/libc-regex.h-define-REG_NOERROR.patch
+++ b/libc/debian/patches/libc-regex.h-define-REG_NOERROR.patch
@@ -1,8 +1,8 @@
 Description: some apps use REG_NOERROR. Found in xfig
-Index: libc/usr/src/head/regex.h
+Index: b/usr/src/head/regex.h
 ===================================================================
---- libc.orig/usr/src/head/regex.h	2012-10-08 00:25:37.000000000 +0000
-+++ libc/usr/src/head/regex.h	2013-04-06 20:15:03.451922538 +0000
+--- a/usr/src/head/regex.h	2014-03-02 23:19:43.835669106 +0400
++++ b/usr/src/head/regex.h	2014-03-02 23:23:54.813522334 +0400
 @@ -100,6 +100,7 @@
  
  /* regcomp and regexec return codes */
diff --git a/libc/debian/patches/libc-sprintf-nul-char.patch b/libc/debian/patches/libc-sprintf-nul-char.patch
index 388780f..2b2b4bb 100644
--- a/libc/debian/patches/libc-sprintf-nul-char.patch
+++ b/libc/debian/patches/libc-sprintf-nul-char.patch
@@ -1,10 +1,10 @@
 Description: fixes sprintf(dest, "xxx%cyyy", '\0')
  dest must not be truncated, it must contain "xxx\0yyy\0"
  This bug probably affects only short strings, see asprintf.c
-Index: libc/usr/src/lib/libc/port/print/asprintf.c
+Index: b/usr/src/lib/libc/port/print/asprintf.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/print/asprintf.c	2012-10-08 04:25:38.000000000 +0400
-+++ libc/usr/src/lib/libc/port/print/asprintf.c	2013-07-20 23:07:35.492115043 +0400
+--- a/usr/src/lib/libc/port/print/asprintf.c	2014-03-02 23:19:37.088764096 +0400
++++ b/usr/src/lib/libc/port/print/asprintf.c	2014-03-02 23:24:16.971174471 +0400
 @@ -49,7 +49,7 @@
  		len = ret + 1;
  		if ((newstr = malloc(len)) == NULL)
diff --git a/libc/debian/patches/libc-uadmin-kiss.patch b/libc/debian/patches/libc-uadmin-kiss.patch
index 3d1ce49..d4d852a 100644
--- a/libc/debian/patches/libc-uadmin-kiss.patch
+++ b/libc/debian/patches/libc-uadmin-kiss.patch
@@ -1,8 +1,8 @@
 Description: we will manage grub and bootarchive via dpkg
-Index: libc/usr/src/lib/libc/i386/sys/uadmin.c
+Index: b/usr/src/lib/libc/i386/sys/uadmin.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/i386/sys/uadmin.c	2012-10-08 04:25:38.000000000 +0400
-+++ libc/usr/src/lib/libc/i386/sys/uadmin.c	2012-10-25 02:36:24.118653822 +0400
+--- a/usr/src/lib/libc/i386/sys/uadmin.c	2014-03-02 23:20:06.639174658 +0400
++++ b/usr/src/lib/libc/i386/sys/uadmin.c	2014-03-02 23:22:41.531581678 +0400
 @@ -24,244 +24,11 @@
   * Use is subject to license terms.
   */
@@ -248,10 +248,10 @@ Index: libc/usr/src/lib/libc/i386/sys/uadmin.c
 -	}
  	return (__uadmin(cmd, fcn, mdep));
  }
-Index: libc/usr/src/lib/libc/amd64/sys/uadmin.c
+Index: b/usr/src/lib/libc/amd64/sys/uadmin.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/amd64/sys/uadmin.c	2012-10-08 04:25:38.000000000 +0400
-+++ libc/usr/src/lib/libc/amd64/sys/uadmin.c	2012-10-25 02:37:00.101693405 +0400
+--- a/usr/src/lib/libc/amd64/sys/uadmin.c	2014-03-02 23:20:06.639275709 +0400
++++ b/usr/src/lib/libc/amd64/sys/uadmin.c	2014-03-02 23:22:41.533912337 +0400
 @@ -24,245 +24,11 @@
   * Use is subject to license terms.
   */
diff --git a/libc/debian/patches/libc-vhangup-returns-int.patch b/libc/debian/patches/libc-vhangup-returns-int.patch
index 4b9a7f4..57048f2 100644
--- a/libc/debian/patches/libc-vhangup-returns-int.patch
+++ b/libc/debian/patches/libc-vhangup-returns-int.patch
@@ -1,8 +1,8 @@
-Index: libc/usr/src/head/unistd.h
+Index: b/usr/src/head/unistd.h
 ===================================================================
---- libc.orig/usr/src/head/unistd.h	2014-02-15 18:07:43.032509874 +0400
-+++ libc/usr/src/head/unistd.h	2014-02-15 18:25:51.832916268 +0400
-@@ -542,7 +542,7 @@
+--- a/usr/src/head/unistd.h	2014-03-02 23:25:01.891531913 +0400
++++ b/usr/src/head/unistd.h	2014-03-02 23:25:04.183106017 +0400
+@@ -569,7 +569,7 @@
  extern pid_t vfork(void) __RETURNS_TWICE;
  #endif /* !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2)... */
  #if !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__)
@@ -11,7 +11,7 @@ Index: libc/usr/src/head/unistd.h
  #endif /* !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__) */
  extern ssize_t write(int, const void *, size_t);
  #if !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__)
-@@ -844,7 +844,7 @@
+@@ -885,7 +885,7 @@
  extern pid_t vfork();
  #endif /* !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2)... */
  #if !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__)
diff --git a/libc/debian/patches/libcrypt-makefile.patch b/libc/debian/patches/libcrypt-makefile.patch
index d261b06..b12cfdf 100644
--- a/libc/debian/patches/libcrypt-makefile.patch
+++ b/libc/debian/patches/libcrypt-makefile.patch
@@ -2,8 +2,8 @@ Description: remove unneded tweaks
  GNU make concerns about malformed target-specific variable definition
 Index: b/usr/src/lib/libcrypt/Makefile.com
 ===================================================================
---- a/usr/src/lib/libcrypt/Makefile.com	2012-09-30 22:01:55.399790758 +0400
-+++ b/usr/src/lib/libcrypt/Makefile.com	2012-09-30 22:04:23.865745580 +0400
+--- a/usr/src/lib/libcrypt/Makefile.com	2014-03-02 23:20:31.996495618 +0400
++++ b/usr/src/lib/libcrypt/Makefile.com	2014-03-02 23:21:16.348197694 +0400
 @@ -57,24 +57,4 @@
  
  include ../../Makefile.targ
diff --git a/libc/debian/patches/libnsl-avoid-libbsm.patch b/libc/debian/patches/libnsl-avoid-libbsm.patch
index 1e769bc..087628e 100644
--- a/libc/debian/patches/libnsl-avoid-libbsm.patch
+++ b/libc/debian/patches/libnsl-avoid-libbsm.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/lib/libnsl/nss/getauuser.c
+Index: b/usr/src/lib/libnsl/nss/getauuser.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/nss/getauuser.c	2012-10-08 04:25:41.000000000 +0400
-+++ libc/usr/src/lib/libnsl/nss/getauuser.c	2012-11-05 16:26:08.053665890 +0400
+--- a/usr/src/lib/libnsl/nss/getauuser.c	2014-03-02 23:20:06.003590032 +0400
++++ b/usr/src/lib/libnsl/nss/getauuser.c	2014-03-02 23:22:44.004572617 +0400
 @@ -31,9 +31,21 @@
  #include <sys/types.h>
  #include <nss_dbdefs.h>
diff --git a/libc/debian/patches/libnsl-cxx-wtf.patch b/libc/debian/patches/libnsl-cxx-wtf.patch
index 755e310..66d65ec 100644
--- a/libc/debian/patches/libnsl-cxx-wtf.patch
+++ b/libc/debian/patches/libnsl-cxx-wtf.patch
@@ -2,8 +2,8 @@ Description: GNU make tries to compile nis_clnt.h via c++
  C++ here is nonsense.
 Index: b/usr/src/lib/libnsl/Makefile.com
 ===================================================================
---- a/usr/src/lib/libnsl/Makefile.com	2012-09-30 22:01:55.516120272 +0400
-+++ b/usr/src/lib/libnsl/Makefile.com	2012-09-30 22:04:23.325266961 +0400
+--- a/usr/src/lib/libnsl/Makefile.com	2014-03-02 23:20:32.576847062 +0400
++++ b/usr/src/lib/libnsl/Makefile.com	2014-03-02 23:21:14.074877974 +0400
 @@ -154,10 +154,6 @@
  	$(POST_PROCESS_O)
  
diff --git a/libc/debian/patches/libnsl-gnu-make.patch b/libc/debian/patches/libnsl-gnu-make.patch
index 3e477b3..c3e704b 100644
--- a/libc/debian/patches/libnsl-gnu-make.patch
+++ b/libc/debian/patches/libnsl-gnu-make.patch
@@ -2,10 +2,10 @@ Description: fixing installing into proto (debian/tmp)
  This is a dirty hack. Without it 'make install' forget
  to walk into subdirs (i386 and amd64) and libnsl is not
  installed into debian/tmp
-Index: libc/usr/src/lib/libnsl/Makefile
+Index: b/usr/src/lib/libnsl/Makefile
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/Makefile	2012-10-08 04:25:41.000000000 +0400
-+++ libc/usr/src/lib/libnsl/Makefile	2012-10-14 02:44:22.021506234 +0400
+--- a/usr/src/lib/libnsl/Makefile	2014-03-02 23:20:08.412496812 +0400
++++ b/usr/src/lib/libnsl/Makefile	2014-03-02 23:22:33.134846119 +0400
 @@ -85,7 +85,7 @@
  headers:	$(PROTOCOL_DIR) .WAIT $(PROTOCOL_FILES) $(PROTOCOL_FILES_UTS) \
  		$(DERIVED_FILES)
diff --git a/libc/debian/patches/libnsl-headers.patch b/libc/debian/patches/libnsl-headers.patch
index aa04341..e22023b 100644
--- a/libc/debian/patches/libnsl-headers.patch
+++ b/libc/debian/patches/libnsl-headers.patch
@@ -1,8 +1,8 @@
-Index: libc/usr/src/lib/libnsl/des/des_crypt.c
+Index: b/usr/src/lib/libnsl/des/des_crypt.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/des/des_crypt.c	2012-10-08 00:25:41.000000000 +0000
-+++ libc/usr/src/lib/libnsl/des/des_crypt.c	2012-11-14 22:22:48.416768374 +0000
-@@ -41,6 +41,7 @@
+--- a/usr/src/lib/libnsl/des/des_crypt.c	2014-03-02 23:20:01.929544667 +0400
++++ b/usr/src/lib/libnsl/des/des_crypt.c	2014-03-02 23:23:01.489462867 +0400
+@@ -39,6 +39,7 @@
  
  #include "mt.h"
  #include <unistd.h>
@@ -10,10 +10,10 @@ Index: libc/usr/src/lib/libnsl/des/des_crypt.c
  #include <fcntl.h>
  #include <sys/types.h>
  #include <rpc/des_crypt.h>
-Index: libc/usr/src/lib/libnsl/rpc/clnt_bcast.c
+Index: b/usr/src/lib/libnsl/rpc/clnt_bcast.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/clnt_bcast.c	2012-11-14 22:36:46.692261541 +0000
-+++ libc/usr/src/lib/libnsl/rpc/clnt_bcast.c	2012-11-14 22:37:04.754915591 +0000
+--- a/usr/src/lib/libnsl/rpc/clnt_bcast.c	2014-03-02 23:20:01.929394655 +0400
++++ b/usr/src/lib/libnsl/rpc/clnt_bcast.c	2014-03-02 23:23:01.492813816 +0400
 @@ -43,6 +43,7 @@
  
  #include "mt.h"
@@ -22,10 +22,10 @@ Index: libc/usr/src/lib/libnsl/rpc/clnt_bcast.c
  #include <string.h>
  #include <strings.h>
  #include <rpc/rpc.h>
-Index: libc/usr/src/lib/libnsl/rpc/clnt_dg.c
+Index: b/usr/src/lib/libnsl/rpc/clnt_dg.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/clnt_dg.c	2012-11-14 22:36:46.692204701 +0000
-+++ libc/usr/src/lib/libnsl/rpc/clnt_dg.c	2012-11-14 22:37:04.758583129 +0000
+--- a/usr/src/lib/libnsl/rpc/clnt_dg.c	2014-03-02 23:20:01.929138541 +0400
++++ b/usr/src/lib/libnsl/rpc/clnt_dg.c	2014-03-02 23:23:01.494874781 +0400
 @@ -40,6 +40,7 @@
  
  #include "mt.h"
@@ -34,10 +34,10 @@ Index: libc/usr/src/lib/libnsl/rpc/clnt_dg.c
  #include <assert.h>
  #include <rpc/rpc.h>
  #include <errno.h>
-Index: libc/usr/src/lib/libnsl/rpc/clnt_door.c
+Index: b/usr/src/lib/libnsl/rpc/clnt_door.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/clnt_door.c	2012-11-14 22:36:46.691993818 +0000
-+++ libc/usr/src/lib/libnsl/rpc/clnt_door.c	2012-11-14 22:37:04.761438370 +0000
+--- a/usr/src/lib/libnsl/rpc/clnt_door.c	2014-03-02 23:20:01.929493310 +0400
++++ b/usr/src/lib/libnsl/rpc/clnt_door.c	2014-03-02 23:23:01.496220534 +0400
 @@ -45,6 +45,7 @@
  #include <rpc/svc_mt.h>
  #include <sys/mman.h>
@@ -46,10 +46,10 @@ Index: libc/usr/src/lib/libnsl/rpc/clnt_door.c
  
  
  extern bool_t xdr_opaque_auth(XDR *, struct opaque_auth *);
-Index: libc/usr/src/lib/libnsl/rpc/clnt_generic.c
+Index: b/usr/src/lib/libnsl/rpc/clnt_generic.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/clnt_generic.c	2012-11-14 22:36:46.692453418 +0000
-+++ libc/usr/src/lib/libnsl/rpc/clnt_generic.c	2012-11-14 22:37:04.764454096 +0000
+--- a/usr/src/lib/libnsl/rpc/clnt_generic.c	2014-03-02 23:20:01.929475703 +0400
++++ b/usr/src/lib/libnsl/rpc/clnt_generic.c	2014-03-02 23:23:01.497865939 +0400
 @@ -45,6 +45,8 @@
  #include <netdir.h>
  #include <string.h>
@@ -59,10 +59,10 @@ Index: libc/usr/src/lib/libnsl/rpc/clnt_generic.c
  
  extern int __td_setnodelay(int);
  extern bool_t __rpc_is_local_host(const char *);
-Index: libc/usr/src/lib/libnsl/rpc/clnt_simple.c
+Index: b/usr/src/lib/libnsl/rpc/clnt_simple.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/clnt_simple.c	2012-11-14 22:36:46.692514015 +0000
-+++ libc/usr/src/lib/libnsl/rpc/clnt_simple.c	2012-11-14 22:37:04.767086563 +0000
+--- a/usr/src/lib/libnsl/rpc/clnt_simple.c	2014-03-02 23:20:01.929038664 +0400
++++ b/usr/src/lib/libnsl/rpc/clnt_simple.c	2014-03-02 23:23:01.499141294 +0400
 @@ -47,6 +47,7 @@
  #include <sys/param.h>
  #include <stdlib.h>
@@ -71,10 +71,10 @@ Index: libc/usr/src/lib/libnsl/rpc/clnt_simple.c
  
  #ifndef MAXHOSTNAMELEN
  #define	MAXHOSTNAMELEN 64
-Index: libc/usr/src/lib/libnsl/rpc/clnt_vc.c
+Index: b/usr/src/lib/libnsl/rpc/clnt_vc.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/clnt_vc.c	2012-11-14 22:36:46.692367959 +0000
-+++ libc/usr/src/lib/libnsl/rpc/clnt_vc.c	2012-11-14 22:38:03.033457532 +0000
+--- a/usr/src/lib/libnsl/rpc/clnt_vc.c	2014-03-02 23:20:01.929457861 +0400
++++ b/usr/src/lib/libnsl/rpc/clnt_vc.c	2014-03-02 23:23:01.502188413 +0400
 @@ -63,6 +63,9 @@
  #include <syslog.h>
  #include <stdlib.h>
@@ -85,10 +85,10 @@ Index: libc/usr/src/lib/libnsl/rpc/clnt_vc.c
  #include <netinet/tcp.h>
  
  #define	MCALL_MSG_SIZE 24
-Index: libc/usr/src/lib/libnsl/rpc/key_call.c
+Index: b/usr/src/lib/libnsl/rpc/key_call.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/key_call.c	2012-10-08 00:25:41.000000000 +0000
-+++ libc/usr/src/lib/libnsl/rpc/key_call.c	2012-11-14 22:38:57.451743694 +0000
+--- a/usr/src/lib/libnsl/rpc/key_call.c	2014-03-02 23:20:01.929272774 +0400
++++ b/usr/src/lib/libnsl/rpc/key_call.c	2014-03-02 23:23:01.503852178 +0400
 @@ -53,6 +53,7 @@
  #include <string.h>
  #include <stdlib.h>
@@ -97,10 +97,10 @@ Index: libc/usr/src/lib/libnsl/rpc/key_call.c
  #include <sys/types.h>
  #include <sys/stat.h>
  
-Index: libc/usr/src/lib/libnsl/rpc/rpc_callmsg.c
+Index: b/usr/src/lib/libnsl/rpc/rpc_callmsg.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/rpc_callmsg.c	2012-10-08 00:25:41.000000000 +0000
-+++ libc/usr/src/lib/libnsl/rpc/rpc_callmsg.c	2012-11-14 22:39:44.783186726 +0000
+--- a/usr/src/lib/libnsl/rpc/rpc_callmsg.c	2014-03-02 23:20:01.929156463 +0400
++++ b/usr/src/lib/libnsl/rpc/rpc_callmsg.c	2014-03-02 23:23:01.505356009 +0400
 @@ -37,6 +37,7 @@
  
  #include "mt.h"
@@ -109,10 +109,10 @@ Index: libc/usr/src/lib/libnsl/rpc/rpc_callmsg.c
  #include <sys/param.h>
  #include <rpc/rpc.h>
  #include <syslog.h>
-Index: libc/usr/src/lib/libnsl/rpc/rpc_generic.c
+Index: b/usr/src/lib/libnsl/rpc/rpc_generic.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/rpc_generic.c	2012-10-08 00:25:41.000000000 +0000
-+++ libc/usr/src/lib/libnsl/rpc/rpc_generic.c	2012-11-14 22:40:21.195927922 +0000
+--- a/usr/src/lib/libnsl/rpc/rpc_generic.c	2014-03-02 23:20:01.929358938 +0400
++++ b/usr/src/lib/libnsl/rpc/rpc_generic.c	2014-03-02 23:23:01.507279693 +0400
 @@ -57,6 +57,7 @@
  #include <sys/systeminfo.h>
  #include <netdir.h>
@@ -121,10 +121,10 @@ Index: libc/usr/src/lib/libnsl/rpc/rpc_generic.c
  
  struct handle {
  	NCONF_HANDLE *nhandle;
-Index: libc/usr/src/lib/libnsl/rpc/rpc_prot.c
+Index: b/usr/src/lib/libnsl/rpc/rpc_prot.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/rpc_prot.c	2012-10-08 00:25:41.000000000 +0000
-+++ libc/usr/src/lib/libnsl/rpc/rpc_prot.c	2012-11-14 22:41:18.386973658 +0000
+--- a/usr/src/lib/libnsl/rpc/rpc_prot.c	2014-03-02 23:20:01.929412622 +0400
++++ b/usr/src/lib/libnsl/rpc/rpc_prot.c	2014-03-02 23:23:01.508654329 +0400
 @@ -48,6 +48,7 @@
  #include <sys/param.h>
  #include <syslog.h>
@@ -133,10 +133,10 @@ Index: libc/usr/src/lib/libnsl/rpc/rpc_prot.c
  #include <malloc.h>
  
  /* * * * * * * * * * * * * * XDR Authentication * * * * * * * * * * * */
-Index: libc/usr/src/lib/libnsl/rpc/rpc_soc.c
+Index: b/usr/src/lib/libnsl/rpc/rpc_soc.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/rpc_soc.c	2012-10-08 00:25:41.000000000 +0000
-+++ libc/usr/src/lib/libnsl/rpc/rpc_soc.c	2012-11-14 22:43:20.569333388 +0000
+--- a/usr/src/lib/libnsl/rpc/rpc_soc.c	2014-03-02 23:20:01.929075040 +0400
++++ b/usr/src/lib/libnsl/rpc/rpc_soc.c	2014-03-02 23:23:01.510216099 +0400
 @@ -62,6 +62,7 @@
  #include <string.h>
  #include <stdlib.h>
@@ -145,10 +145,10 @@ Index: libc/usr/src/lib/libnsl/rpc/rpc_soc.c
  
  int __rpc_bindresvport(int, struct sockaddr_in *, int *, int);
  int __rpc_bindresvport_ipv6(int, struct sockaddr *, int *, int, char *);
-Index: libc/usr/src/lib/libnsl/rpc/svc_auth_loopb.c
+Index: b/usr/src/lib/libnsl/rpc/svc_auth_loopb.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/svc_auth_loopb.c	2012-10-08 00:25:41.000000000 +0000
-+++ libc/usr/src/lib/libnsl/rpc/svc_auth_loopb.c	2012-11-14 22:45:01.360343908 +0000
+--- a/usr/src/lib/libnsl/rpc/svc_auth_loopb.c	2014-03-02 23:20:01.929254222 +0400
++++ b/usr/src/lib/libnsl/rpc/svc_auth_loopb.c	2014-03-02 23:23:01.511483481 +0400
 @@ -35,6 +35,7 @@
  #include "mt.h"
  #include <stdio.h>
@@ -157,10 +157,10 @@ Index: libc/usr/src/lib/libnsl/rpc/svc_auth_loopb.c
  #include <syslog.h>
  #include <sys/types.h>
  
-Index: libc/usr/src/lib/libnsl/rpc/svc_dg.c
+Index: b/usr/src/lib/libnsl/rpc/svc_dg.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/svc_dg.c	2012-10-08 00:25:41.000000000 +0000
-+++ libc/usr/src/lib/libnsl/rpc/svc_dg.c	2012-11-14 22:46:18.805571897 +0000
+--- a/usr/src/lib/libnsl/rpc/svc_dg.c	2014-03-02 23:20:01.929120823 +0400
++++ b/usr/src/lib/libnsl/rpc/svc_dg.c	2014-03-02 23:23:01.513317682 +0400
 @@ -50,6 +50,7 @@
  #include <string.h>
  #include <ucred.h>
@@ -169,10 +169,10 @@ Index: libc/usr/src/lib/libnsl/rpc/svc_dg.c
  #include <sys/socket.h>
  #include <netinet/in.h>
  #include <arpa/inet.h>
-Index: libc/usr/src/lib/libnsl/rpc/svc_door.c
+Index: b/usr/src/lib/libnsl/rpc/svc_door.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/svc_door.c	2012-10-08 00:25:41.000000000 +0000
-+++ libc/usr/src/lib/libnsl/rpc/svc_door.c	2012-11-14 22:47:13.578767266 +0000
+--- a/usr/src/lib/libnsl/rpc/svc_door.c	2014-03-02 23:20:01.929377102 +0400
++++ b/usr/src/lib/libnsl/rpc/svc_door.c	2014-03-02 23:23:01.514770682 +0400
 @@ -43,6 +43,7 @@
  #include <alloca.h>
  #include <dlfcn.h>
@@ -181,11 +181,11 @@ Index: libc/usr/src/lib/libnsl/rpc/svc_door.c
  #include <rpc/svc_mt.h>
  
  static void svc_door_destroy_pvt();
-Index: libc/usr/src/lib/libnsl/rpc/svc_generic.c
+Index: b/usr/src/lib/libnsl/rpc/svc_generic.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/svc_generic.c	2012-11-14 21:33:25.551519432 +0000
-+++ libc/usr/src/lib/libnsl/rpc/svc_generic.c	2012-11-14 22:48:57.353541655 +0000
-@@ -32,6 +32,7 @@
+--- a/usr/src/lib/libnsl/rpc/svc_generic.c	2014-03-02 23:21:44.857594058 +0400
++++ b/usr/src/lib/libnsl/rpc/svc_generic.c	2014-03-02 23:23:01.516273227 +0400
+@@ -33,6 +33,7 @@
   */
  
  #include "mt.h"
@@ -193,11 +193,11 @@ Index: libc/usr/src/lib/libnsl/rpc/svc_generic.c
  #include <stdlib.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
-Index: libc/usr/src/lib/libnsl/rpc/svc_run.c
+Index: b/usr/src/lib/libnsl/rpc/svc_run.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/svc_run.c	2012-10-08 00:25:41.000000000 +0000
-+++ libc/usr/src/lib/libnsl/rpc/svc_run.c	2012-11-14 22:49:53.936335324 +0000
-@@ -52,6 +52,8 @@
+--- a/usr/src/lib/libnsl/rpc/svc_run.c	2014-03-02 23:20:01.929102560 +0400
++++ b/usr/src/lib/libnsl/rpc/svc_run.c	2014-03-02 23:23:01.518246464 +0400
+@@ -53,6 +53,8 @@
  #include <assert.h>
  #include <libintl.h>
  #include <values.h>
@@ -206,10 +206,10 @@ Index: libc/usr/src/lib/libnsl/rpc/svc_run.c
  
  extern const char __nsl_dom[];
  
-Index: libc/usr/src/lib/libnsl/rpc/svc_simple.c
+Index: b/usr/src/lib/libnsl/rpc/svc_simple.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/svc_simple.c	2012-10-08 00:25:41.000000000 +0000
-+++ libc/usr/src/lib/libnsl/rpc/svc_simple.c	2012-11-14 22:51:55.310380241 +0000
+--- a/usr/src/lib/libnsl/rpc/svc_simple.c	2014-03-02 23:20:01.928969125 +0400
++++ b/usr/src/lib/libnsl/rpc/svc_simple.c	2014-03-02 23:23:01.519895105 +0400
 @@ -45,6 +45,7 @@
  #include "mt.h"
  #include "rpc_mt.h"
@@ -218,11 +218,11 @@ Index: libc/usr/src/lib/libnsl/rpc/svc_simple.c
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-Index: libc/usr/src/lib/libnsl/rpc/svc_vc.c
+Index: b/usr/src/lib/libnsl/rpc/svc_vc.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/svc_vc.c	2012-10-08 00:25:41.000000000 +0000
-+++ libc/usr/src/lib/libnsl/rpc/svc_vc.c	2012-11-14 22:53:36.982004850 +0000
-@@ -43,6 +43,7 @@
+--- a/usr/src/lib/libnsl/rpc/svc_vc.c	2014-03-02 23:20:01.929439405 +0400
++++ b/usr/src/lib/libnsl/rpc/svc_vc.c	2014-03-02 23:23:01.522762509 +0400
+@@ -46,6 +46,7 @@
  #include "mt.h"
  #include "rpc_mt.h"
  #include <stdio.h>
@@ -230,10 +230,10 @@ Index: libc/usr/src/lib/libnsl/rpc/svc_vc.c
  #include <stdlib.h>
  #include <rpc/rpc.h>
  #include <sys/types.h>
-Index: libc/usr/src/lib/libnsl/rpc/ti_opts.c
+Index: b/usr/src/lib/libnsl/rpc/ti_opts.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/rpc/ti_opts.c	2012-11-14 21:33:25.553706650 +0000
-+++ libc/usr/src/lib/libnsl/rpc/ti_opts.c	2012-11-14 22:54:36.796097676 +0000
+--- a/usr/src/lib/libnsl/rpc/ti_opts.c	2014-03-02 23:21:44.859431053 +0400
++++ b/usr/src/lib/libnsl/rpc/ti_opts.c	2014-03-02 23:23:01.524359130 +0400
 @@ -36,6 +36,7 @@
  
  #include "mt.h"
@@ -242,10 +242,10 @@ Index: libc/usr/src/lib/libnsl/rpc/ti_opts.c
  #include <netinet/in.h>
  #include <netinet/tcp.h>
  #include <netinet/udp.h>
-Index: libc/usr/src/lib/libnsl/yp/yp_bind.c
+Index: b/usr/src/lib/libnsl/yp/yp_bind.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/yp/yp_bind.c	2012-10-08 00:25:41.000000000 +0000
-+++ libc/usr/src/lib/libnsl/yp/yp_bind.c	2012-11-14 22:56:19.116358356 +0000
+--- a/usr/src/lib/libnsl/yp/yp_bind.c	2014-03-02 23:20:01.929564122 +0400
++++ b/usr/src/lib/libnsl/yp/yp_bind.c	2014-03-02 23:23:01.526547164 +0400
 @@ -34,6 +34,7 @@
  #include "mt.h"
  #include "../rpc/rpc_mt.h"
@@ -254,10 +254,10 @@ Index: libc/usr/src/lib/libnsl/yp/yp_bind.c
  #include <stdlib.h>
  #include <string.h>
  #include <sys/types.h>
-Index: libc/usr/src/lib/libnsl/nis/gen/nis_subr.c
+Index: b/usr/src/lib/libnsl/nis/gen/nis_subr.c
 ===================================================================
---- libc.orig/usr/src/lib/libnsl/nis/gen/nis_subr.c	2012-10-08 00:25:41.000000000 +0000
-+++ libc/usr/src/lib/libnsl/nis/gen/nis_subr.c	2012-11-14 22:57:34.639930446 +0000
+--- a/usr/src/lib/libnsl/nis/gen/nis_subr.c	2014-03-02 23:20:01.929524611 +0400
++++ b/usr/src/lib/libnsl/nis/gen/nis_subr.c	2014-03-02 23:23:01.528651179 +0400
 @@ -30,6 +30,7 @@
   * objects and names.
   */
diff --git a/libc/debian/patches/libnsl-ipsec_proto_t.patch b/libc/debian/patches/libnsl-ipsec_proto_t.patch
index ec793a4..7627e7b 100644
--- a/libc/debian/patches/libnsl-ipsec_proto_t.patch
+++ b/libc/debian/patches/libnsl-ipsec_proto_t.patch
@@ -11,8 +11,8 @@ Description: avoid ipsec_util.h dependency
 Bug: https://www.illumos.org/issues/3176
 Index: b/usr/src/lib/libnsl/ipsec/algs.c
 ===================================================================
---- a/usr/src/lib/libnsl/ipsec/algs.c	2012-09-30 22:01:53.278951312 +0400
-+++ b/usr/src/lib/libnsl/ipsec/algs.c	2012-09-30 22:04:32.415801562 +0400
+--- a/usr/src/lib/libnsl/ipsec/algs.c	2014-03-02 23:20:21.081043103 +0400
++++ b/usr/src/lib/libnsl/ipsec/algs.c	2014-03-02 23:21:50.048970643 +0400
 @@ -28,7 +28,6 @@
  #include <sys/types.h>
  #include <sys/errno.h>
diff --git a/libc/debian/patches/librpcsvc-gnumake.patch b/libc/debian/patches/librpcsvc-gnumake.patch
index 0530e9f..aea1ed4 100644
--- a/libc/debian/patches/librpcsvc-gnumake.patch
+++ b/libc/debian/patches/librpcsvc-gnumake.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/lib/librpcsvc/Makefile
+Index: b/usr/src/lib/librpcsvc/Makefile
 ===================================================================
---- libc.orig/usr/src/lib/librpcsvc/Makefile	2013-09-27 23:01:58.350192743 +0400
-+++ libc/usr/src/lib/librpcsvc/Makefile	2013-09-27 23:20:45.084479410 +0400
+--- a/usr/src/lib/librpcsvc/Makefile	2014-03-02 23:24:27.919793293 +0400
++++ b/usr/src/lib/librpcsvc/Makefile	2014-03-02 23:24:39.189197287 +0400
 @@ -68,7 +68,8 @@
  
  all:	$(DERIVED_FILES) $(TXTS) .WAIT $(SUBDIRS)
diff --git a/libc/debian/patches/librpcsvc-use-system-x.patch b/libc/debian/patches/librpcsvc-use-system-x.patch
index 5963e2b..96d5282 100644
--- a/libc/debian/patches/librpcsvc-use-system-x.patch
+++ b/libc/debian/patches/librpcsvc-use-system-x.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/lib/librpcsvc/Makefile
+Index: b/usr/src/lib/librpcsvc/Makefile
 ===================================================================
---- libc.orig/usr/src/lib/librpcsvc/Makefile	2012-10-08 04:25:42.000000000 +0400
-+++ libc/usr/src/lib/librpcsvc/Makefile	2013-09-27 18:25:14.854624400 +0400
+--- a/usr/src/lib/librpcsvc/Makefile	2014-03-02 23:19:33.468701113 +0400
++++ b/usr/src/lib/librpcsvc/Makefile	2014-03-02 23:24:27.919793293 +0400
 @@ -90,8 +90,8 @@
  common/rusers_xdr.c: $(PROTOCOL_DIR)/rusers.x
  	$(RPCGEN) -c $(PROTOCOL_DIR)/rusers.x > $@
diff --git a/libc/debian/patches/librpcsvc-usr-lib.patch b/libc/debian/patches/librpcsvc-usr-lib.patch
index 1fe235e..c0b2854 100644
--- a/libc/debian/patches/librpcsvc-usr-lib.patch
+++ b/libc/debian/patches/librpcsvc-usr-lib.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/lib/librpcsvc/Makefile.com
+Index: b/usr/src/lib/librpcsvc/Makefile.com
 ===================================================================
---- libc.orig/usr/src/lib/librpcsvc/Makefile.com	2012-10-08 04:25:42.000000000 +0400
-+++ libc/usr/src/lib/librpcsvc/Makefile.com	2013-09-27 18:56:03.915411833 +0400
+--- a/usr/src/lib/librpcsvc/Makefile.com	2014-03-02 23:19:30.717989261 +0400
++++ b/usr/src/lib/librpcsvc/Makefile.com	2014-03-02 23:24:36.842414895 +0400
 @@ -35,9 +35,6 @@
  # include library definitions
  include ../../Makefile.lib
diff --git a/libc/debian/patches/libsecdb-only-lib.patch b/libc/debian/patches/libsecdb-only-lib.patch
index b06102b..9013bf7 100644
--- a/libc/debian/patches/libsecdb-only-lib.patch
+++ b/libc/debian/patches/libsecdb-only-lib.patch
@@ -4,8 +4,8 @@ Description: build and install only the library
 
 Index: b/usr/src/lib/libsecdb/Makefile
 ===================================================================
---- a/usr/src/lib/libsecdb/Makefile	2012-09-30 22:01:53.397905287 +0400
-+++ b/usr/src/lib/libsecdb/Makefile	2012-09-30 22:04:31.794820100 +0400
+--- a/usr/src/lib/libsecdb/Makefile	2014-03-02 23:20:21.632250292 +0400
++++ b/usr/src/lib/libsecdb/Makefile	2014-03-02 23:21:47.772424220 +0400
 @@ -75,12 +75,6 @@
  all clean clobber delete install lint package: $(SUBDIRS)
  _msg: $(MSGSUBDIRS)
diff --git a/libc/debian/patches/libsocket-binutils-2.23-weak.patch b/libc/debian/patches/libsocket-binutils-2.23-weak.patch
index 0ca39c7..a85f7c6 100644
--- a/libc/debian/patches/libsocket-binutils-2.23-weak.patch
+++ b/libc/debian/patches/libsocket-binutils-2.23-weak.patch
@@ -3,10 +3,10 @@ Description: redefine_extname sets socket to __xnet_socket,
  and thus __xnet_socket is multiple defined in assembler code. Similar for
  other weaks, but "bind" for example is not defined at all.
  Put all weak pragmas before headers so redefine_extname is not in action.
-Index: libc/usr/src/lib/libsocket/socket/socket.c
+Index: b/usr/src/lib/libsocket/socket/socket.c
 ===================================================================
---- libc.orig/usr/src/lib/libsocket/socket/socket.c	2012-10-08 04:25:42.000000000 +0400
-+++ libc/usr/src/lib/libsocket/socket/socket.c	2013-08-29 10:44:24.704027938 +0400
+--- a/usr/src/lib/libsocket/socket/socket.c	2014-03-02 23:19:34.056591819 +0400
++++ b/usr/src/lib/libsocket/socket/socket.c	2014-03-02 23:24:25.313113115 +0400
 @@ -35,6 +35,8 @@
   * contributors.
   */
@@ -25,10 +25,10 @@ Index: libc/usr/src/lib/libsocket/socket/socket.c
  int
  _socket(int family, int type, int protocol)
  {
-Index: libc/usr/src/lib/libsocket/socket/socketpair.c
+Index: b/usr/src/lib/libsocket/socket/socketpair.c
 ===================================================================
---- libc.orig/usr/src/lib/libsocket/socket/socketpair.c	2012-10-08 04:25:42.000000000 +0400
-+++ libc/usr/src/lib/libsocket/socket/socketpair.c	2013-08-29 10:44:39.553764223 +0400
+--- a/usr/src/lib/libsocket/socket/socketpair.c	2014-03-02 23:19:34.056724820 +0400
++++ b/usr/src/lib/libsocket/socket/socketpair.c	2014-03-02 23:24:25.314877380 +0400
 @@ -39,6 +39,8 @@
  
  #pragma ident	"%Z%%M%	%I%	%E% SMI"
@@ -47,13 +47,13 @@ Index: libc/usr/src/lib/libsocket/socket/socketpair.c
  int
  _socketpair(int family, int type, int protocol, int sv[2])
  {
-Index: libc/usr/src/lib/libsocket/socket/weaks.c
+Index: b/usr/src/lib/libsocket/socket/weaks.c
 ===================================================================
---- libc.orig/usr/src/lib/libsocket/socket/weaks.c	2012-10-08 04:25:42.000000000 +0400
-+++ libc/usr/src/lib/libsocket/socket/weaks.c	2013-08-29 10:44:09.838229775 +0400
+--- a/usr/src/lib/libsocket/socket/weaks.c	2014-03-02 23:19:34.056679443 +0400
++++ b/usr/src/lib/libsocket/socket/weaks.c	2014-03-02 23:24:25.316645451 +0400
 @@ -26,21 +26,6 @@
  
- #pragma ident	"%Z%%M%	%I%	%E% SMI"
+ /* Copyright (c) 2013, OmniTI Computer Consulting, Inc. All rights reserved. */
  
 -#include <sys/types.h>
 -#include <sys/socket.h>
@@ -73,7 +73,7 @@ Index: libc/usr/src/lib/libsocket/socket/weaks.c
  #pragma weak bind = _bind
  #pragma weak listen = _listen
  #pragma weak accept = _accept
-@@ -57,6 +42,21 @@
+@@ -58,6 +43,21 @@
  #pragma weak getsockopt = _getsockopt
  #pragma weak setsockopt = _setsockopt
  
diff --git a/libc/debian/patches/localedef-bison.patch b/libc/debian/patches/localedef-bison.patch
index d64b3e7..6be7475 100644
--- a/libc/debian/patches/localedef-bison.patch
+++ b/libc/debian/patches/localedef-bison.patch
@@ -1,11 +1,11 @@
 Description: 
  1. yylex() - implicit declaration
  2. yydebug() - undefined at link time (fixed with -t)
-Index: libc/usr/src/cmd/localedef/Makefile
+Index: b/usr/src/cmd/localedef/Makefile
 ===================================================================
---- libc.orig/usr/src/cmd/localedef/Makefile	2012-09-30 20:41:11.000000000 +0400
-+++ libc/usr/src/cmd/localedef/Makefile	2012-10-07 12:43:54.339619150 +0400
-@@ -29,9 +29,10 @@
+--- a/usr/src/cmd/localedef/Makefile	2014-03-02 23:20:15.383971949 +0400
++++ b/usr/src/cmd/localedef/Makefile	2014-03-02 23:22:09.321875952 +0400
+@@ -30,9 +30,10 @@
  CERRWARN	+= -_gcc=-Wno-char-subscripts
  CERRWARN	+= -_gcc=-Wno-uninitialized
  CERRWARN	+= -_gcc=-Wno-unused-label
diff --git a/libc/debian/patches/localedef-only.patch b/libc/debian/patches/localedef-only.patch
index 806de9e..3b3634e 100644
--- a/libc/debian/patches/localedef-only.patch
+++ b/libc/debian/patches/localedef-only.patch
@@ -1,9 +1,9 @@
 Description: only build localedef, we treat data specially.
-Index: libc/usr/src/cmd/localedef/Makefile
+Index: b/usr/src/cmd/localedef/Makefile
 ===================================================================
---- libc.orig/usr/src/cmd/localedef/Makefile	2012-10-02 02:48:17.184524105 +0400
-+++ libc/usr/src/cmd/localedef/Makefile	2012-10-02 02:56:51.937247303 +0400
-@@ -229,9 +229,9 @@
+--- a/usr/src/cmd/localedef/Makefile	2014-03-02 23:22:09.321875952 +0400
++++ b/usr/src/cmd/localedef/Makefile	2014-03-02 23:22:11.558962948 +0400
+@@ -232,9 +232,9 @@
  
  $(ROOTDATA)	:= FILEMODE=0444
  
diff --git a/libc/debian/patches/mogrify-libc-mapfile-vers.patch b/libc/debian/patches/mogrify-libc-mapfile-vers.patch
index 592d2d0..91821ec 100644
--- a/libc/debian/patches/mogrify-libc-mapfile-vers.patch
+++ b/libc/debian/patches/mogrify-libc-mapfile-vers.patch
@@ -1,8 +1,8 @@
-Index: libc/usr/src/lib/libc/amd64/Makefile
+Index: b/usr/src/lib/libc/amd64/Makefile
 ===================================================================
---- libc.orig/usr/src/lib/libc/amd64/Makefile	2013-03-04 14:31:17.584196755 +0000
-+++ libc/usr/src/lib/libc/amd64/Makefile	2013-03-04 14:37:23.894187665 +0000
-@@ -998,7 +998,7 @@
+--- a/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:23:22.199577360 +0400
++++ b/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:23:25.776578710 +0400
+@@ -1002,7 +1002,7 @@
  
  $(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS)
  
@@ -11,7 +11,7 @@ Index: libc/usr/src/lib/libc/amd64/Makefile
  
  CPPFLAGS=	-D_REENTRANT -D$(MACH64) -D__$(MACH64) $(THREAD_DEBUG) \
  		-I. -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc $(CPPFLAGS.master)
-@@ -1037,6 +1037,7 @@
+@@ -1041,6 +1041,7 @@
  
  # extra files for the clean target
  CLEANFILES=			\
@@ -19,11 +19,11 @@ Index: libc/usr/src/lib/libc/amd64/Makefile
  	$(LIBCDIR)/port/gen/errlst.c	\
  	$(LIBCDIR)/port/gen/new_list.c	\
  	assym.h			\
-Index: libc/usr/src/lib/libc/i386/Makefile.com
+Index: b/usr/src/lib/libc/i386/Makefile.com
 ===================================================================
---- libc.orig/usr/src/lib/libc/i386/Makefile.com	2013-03-04 14:31:17.587371735 +0000
-+++ libc/usr/src/lib/libc/i386/Makefile.com	2013-03-04 14:38:44.424057695 +0000
-@@ -1042,7 +1042,7 @@
+--- a/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:23:22.203374092 +0400
++++ b/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:23:25.780346100 +0400
+@@ -1046,7 +1046,7 @@
  $(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) \
  		$(EXTPICS) $(LDLIBS)
  
@@ -32,7 +32,7 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com
  
  #
  # EXTN_CPPFLAGS and EXTN_CFLAGS set in enclosing Makefile
-@@ -1092,6 +1092,7 @@
+@@ -1096,6 +1096,7 @@
  
  # extra files for the clean target
  CLEANFILES=			\
@@ -40,10 +40,10 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com
  	$(LIBCDIR)/port/gen/errlst.c	\
  	$(LIBCDIR)/port/gen/new_list.c	\
  	assym.h			\
-Index: libc/usr/src/lib/libc/Makefile.targ
+Index: b/usr/src/lib/libc/Makefile.targ
 ===================================================================
---- libc.orig/usr/src/lib/libc/Makefile.targ	2013-03-04 14:31:05.096287707 +0000
-+++ libc/usr/src/lib/libc/Makefile.targ	2013-03-04 14:54:38.356074259 +0000
+--- a/usr/src/lib/libc/Makefile.targ	2014-03-02 23:21:18.678755158 +0400
++++ b/usr/src/lib/libc/Makefile.targ	2014-03-02 23:23:25.782140164 +0400
 @@ -26,6 +26,12 @@
  
  # libc build rules
diff --git a/libc/debian/patches/no-hwcap.patch b/libc/debian/patches/no-hwcap.patch
index 6a3bebc..412a229 100644
--- a/libc/debian/patches/no-hwcap.patch
+++ b/libc/debian/patches/no-hwcap.patch
@@ -1,8 +1,8 @@
 Description: do not build and install special version of libc
 Index: b/usr/src/lib/libc/Makefile
 ===================================================================
---- a/usr/src/lib/libc/Makefile	2012-09-30 22:04:21.054036416 +0400
-+++ b/usr/src/lib/libc/Makefile	2012-09-30 22:04:21.561846261 +0400
+--- a/usr/src/lib/libc/Makefile	2014-03-02 23:21:06.620742950 +0400
++++ b/usr/src/lib/libc/Makefile	2014-03-02 23:21:08.853262692 +0400
 @@ -73,7 +73,7 @@
  VAR1_DYNLIB64 =	$(LIBRARY:%.a=%_$(VAR1).so$(VERS))
  VAR1_BLDDIR64 =	$(MACH)_$(VAR1)/$(VARBLD64)
diff --git a/libc/debian/patches/no-lint.patch b/libc/debian/patches/no-lint.patch
index 9e010e9..6a26446 100644
--- a/libc/debian/patches/no-lint.patch
+++ b/libc/debian/patches/no-lint.patch
@@ -1,8 +1,8 @@
 Index: b/usr/src/lib/libc/Makefile
 ===================================================================
---- a/usr/src/lib/libc/Makefile	2012-09-30 22:01:56.325784168 +0400
-+++ b/usr/src/lib/libc/Makefile	2012-09-30 22:04:21.054036416 +0400
-@@ -169,12 +169,10 @@
+--- a/usr/src/lib/libc/Makefile	2014-03-02 23:20:35.481199587 +0400
++++ b/usr/src/lib/libc/Makefile	2014-03-02 23:21:06.620742950 +0400
+@@ -171,12 +171,10 @@
  		inslib32		\
  		$(BUILD64) inslib64
  
diff --git a/libc/debian/patches/no-lvm.patch b/libc/debian/patches/no-lvm.patch
index 187946d..2cc0602 100644
--- a/libc/debian/patches/no-lvm.patch
+++ b/libc/debian/patches/no-lvm.patch
@@ -1,8 +1,8 @@
 Index: b/usr/src/head/Makefile
 ===================================================================
---- a/usr/src/head/Makefile	2012-09-30 22:01:57.517971003 +0400
-+++ b/usr/src/head/Makefile	2012-09-30 22:04:16.565510958 +0400
-@@ -273,8 +273,6 @@
+--- a/usr/src/head/Makefile	2014-03-02 23:20:41.219547129 +0400
++++ b/usr/src/head/Makefile	2014-03-02 23:20:48.806778994 +0400
+@@ -272,8 +272,6 @@
  	ufs_prot.h	\
  	nfs_acl.h
  
diff --git a/libc/debian/patches/nss-files-avoid-libtsnet.patch b/libc/debian/patches/nss-files-avoid-libtsnet.patch
index 86db337..d5911d2 100644
--- a/libc/debian/patches/nss-files-avoid-libtsnet.patch
+++ b/libc/debian/patches/nss-files-avoid-libtsnet.patch
@@ -1,8 +1,8 @@
 Description: we need only path!
-Index: libc/usr/src/lib/nsswitch/files/common/tsol_getrhent.c
+Index: b/usr/src/lib/nsswitch/files/common/tsol_getrhent.c
 ===================================================================
---- libc.orig/usr/src/lib/nsswitch/files/common/tsol_getrhent.c	2012-09-30 20:41:27.000000000 +0400
-+++ libc/usr/src/lib/nsswitch/files/common/tsol_getrhent.c	2012-10-03 23:31:30.562664652 +0400
+--- a/usr/src/lib/nsswitch/files/common/tsol_getrhent.c	2014-03-02 23:20:13.745709322 +0400
++++ b/usr/src/lib/nsswitch/files/common/tsol_getrhent.c	2014-03-02 23:22:13.821327832 +0400
 @@ -27,7 +27,7 @@
  
  #include "files_common.h"
diff --git a/libc/debian/patches/nss_compat-avoid-libbsm.patch b/libc/debian/patches/nss_compat-avoid-libbsm.patch
index dfa22b3..662b963 100644
--- a/libc/debian/patches/nss_compat-avoid-libbsm.patch
+++ b/libc/debian/patches/nss_compat-avoid-libbsm.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/lib/nsswitch/compat/common/compat_common.c
+Index: b/usr/src/lib/nsswitch/compat/common/compat_common.c
 ===================================================================
---- libc.orig/usr/src/lib/nsswitch/compat/common/compat_common.c	2012-10-08 04:25:43.000000000 +0400
-+++ libc/usr/src/lib/nsswitch/compat/common/compat_common.c	2012-11-05 16:54:37.000715669 +0400
+--- a/usr/src/lib/nsswitch/compat/common/compat_common.c	2014-03-02 23:20:04.291950344 +0400
++++ b/usr/src/lib/nsswitch/compat/common/compat_common.c	2014-03-02 23:22:50.779201328 +0400
 @@ -32,7 +32,6 @@
  #include <stdlib.h>
  #include <string.h>
@@ -27,10 +27,10 @@ Index: libc/usr/src/lib/nsswitch/compat/common/compat_common.c
  /*
   * This should be in a header.
   */
-Index: libc/usr/src/lib/nsswitch/compat/common/getauuser.c
+Index: b/usr/src/lib/nsswitch/compat/common/getauuser.c
 ===================================================================
---- libc.orig/usr/src/lib/nsswitch/compat/common/getauuser.c	2012-10-08 04:25:43.000000000 +0400
-+++ libc/usr/src/lib/nsswitch/compat/common/getauuser.c	2012-11-05 16:56:44.249532291 +0400
+--- a/usr/src/lib/nsswitch/compat/common/getauuser.c	2014-03-02 23:20:04.291767239 +0400
++++ b/usr/src/lib/nsswitch/compat/common/getauuser.c	2014-03-02 23:22:50.780852470 +0400
 @@ -28,9 +28,18 @@
  #include <sys/types.h>
  #include <stdlib.h>
diff --git a/libc/debian/patches/nss_files-avoid-libbsm.patch b/libc/debian/patches/nss_files-avoid-libbsm.patch
index 2b1fe1a..dbca34f 100644
--- a/libc/debian/patches/nss_files-avoid-libbsm.patch
+++ b/libc/debian/patches/nss_files-avoid-libbsm.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/lib/nsswitch/files/common/getauuser.c
+Index: b/usr/src/lib/nsswitch/files/common/getauuser.c
 ===================================================================
---- libc.orig/usr/src/lib/nsswitch/files/common/getauuser.c	2012-10-08 04:25:43.000000000 +0400
-+++ libc/usr/src/lib/nsswitch/files/common/getauuser.c	2012-11-05 16:47:49.762978764 +0400
+--- a/usr/src/lib/nsswitch/files/common/getauuser.c	2014-03-02 23:20:05.457942769 +0400
++++ b/usr/src/lib/nsswitch/files/common/getauuser.c	2014-03-02 23:22:46.250699873 +0400
 @@ -27,9 +27,12 @@
  
  
diff --git a/libc/debian/patches/nss_nis-avoid-libbsm.patch b/libc/debian/patches/nss_nis-avoid-libbsm.patch
index d5ee0ab..83b127a 100644
--- a/libc/debian/patches/nss_nis-avoid-libbsm.patch
+++ b/libc/debian/patches/nss_nis-avoid-libbsm.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/lib/nsswitch/nis/common/getauuser.c
+Index: b/usr/src/lib/nsswitch/nis/common/getauuser.c
 ===================================================================
---- libc.orig/usr/src/lib/nsswitch/nis/common/getauuser.c	2012-10-08 04:25:43.000000000 +0400
-+++ libc/usr/src/lib/nsswitch/nis/common/getauuser.c	2012-11-05 16:48:51.283369325 +0400
+--- a/usr/src/lib/nsswitch/nis/common/getauuser.c	2014-03-02 23:20:04.886248113 +0400
++++ b/usr/src/lib/nsswitch/nis/common/getauuser.c	2014-03-02 23:22:48.499391417 +0400
 @@ -28,7 +28,6 @@
  #include <sys/types.h>
  #include <stdlib.h>
diff --git a/libc/debian/patches/nss_status-glibc-compat.patch b/libc/debian/patches/nss_status-glibc-compat.patch
index c4f64ed..51d81b6 100644
--- a/libc/debian/patches/nss_status-glibc-compat.patch
+++ b/libc/debian/patches/nss_status-glibc-compat.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/head/nss_common.h
+Index: b/usr/src/head/nss_common.h
 ===================================================================
---- libc.orig/usr/src/head/nss_common.h	2012-10-08 04:25:37.000000000 +0400
-+++ libc/usr/src/head/nss_common.h	2013-05-31 14:53:47.514394041 +0400
+--- a/usr/src/head/nss_common.h	2014-03-02 23:19:43.287813948 +0400
++++ b/usr/src/head/nss_common.h	2014-03-02 23:23:56.996612117 +0400
 @@ -233,11 +233,15 @@
   * is for nscd private/internal use only.
   */
diff --git a/libc/debian/patches/objects-path.patch b/libc/debian/patches/objects-path.patch
index 5d6c8de..bddf61a 100644
--- a/libc/debian/patches/objects-path.patch
+++ b/libc/debian/patches/objects-path.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/lib/common/Makefile.com
+Index: b/usr/src/lib/common/Makefile.com
 ===================================================================
---- libc.orig/usr/src/lib/common/Makefile.com	2012-09-30 20:41:17.000000000 +0400
-+++ libc/usr/src/lib/common/Makefile.com	2012-10-07 22:21:34.026267746 +0400
+--- a/usr/src/lib/common/Makefile.com	2014-03-02 23:20:09.629328884 +0400
++++ b/usr/src/lib/common/Makefile.com	2014-03-02 23:22:28.694903466 +0400
 @@ -40,8 +40,8 @@
  OBJECTS = $(VALUES) $(CRTI) $(CRTN)
  $(INTEL_BLD)OBJECTS += $(CRT1) $(GCRT1)
diff --git a/libc/debian/patches/perl-path.patch b/libc/debian/patches/perl-path.patch
index f57c5e6..600506b 100644
--- a/libc/debian/patches/perl-path.patch
+++ b/libc/debian/patches/perl-path.patch
@@ -1,7 +1,7 @@
 Index: b/usr/src/lib/libc/extract-copyright.pl
 ===================================================================
---- a/usr/src/lib/libc/extract-copyright.pl	2012-09-30 22:01:56.439454147 +0400
-+++ b/usr/src/lib/libc/extract-copyright.pl	2012-09-30 22:04:20.543591513 +0400
+--- a/usr/src/lib/libc/extract-copyright.pl	2014-03-02 23:20:36.077189660 +0400
++++ b/usr/src/lib/libc/extract-copyright.pl	2014-03-02 23:21:04.351090029 +0400
 @@ -1,4 +1,4 @@
 -#! /usr/perl5/bin/perl
 +#!/usr/bin/perl
diff --git a/libc/debian/patches/rename-libavl.patch b/libc/debian/patches/rename-libavl.patch
index fbec11d..95cbf3c 100644
--- a/libc/debian/patches/rename-libavl.patch
+++ b/libc/debian/patches/rename-libavl.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/lib/libavl/Makefile.com
+Index: b/usr/src/lib/libavl/Makefile.com
 ===================================================================
---- libc.orig/usr/src/lib/libavl/Makefile.com	2012-10-08 00:25:38.000000000 +0000
-+++ libc/usr/src/lib/libavl/Makefile.com	2013-02-14 18:22:41.496105364 +0000
+--- a/usr/src/lib/libavl/Makefile.com	2014-03-02 23:19:58.137873049 +0400
++++ b/usr/src/lib/libavl/Makefile.com	2014-03-02 23:23:17.146515152 +0400
 @@ -25,7 +25,7 @@
  # ident	"%Z%%M%	%I%	%E% SMI"
  #
diff --git a/libc/debian/patches/rpcinfo-MAX.patch b/libc/debian/patches/rpcinfo-MAX.patch
index f50ada7..ad56855 100644
--- a/libc/debian/patches/rpcinfo-MAX.patch
+++ b/libc/debian/patches/rpcinfo-MAX.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/cmd/rpcinfo/rpcinfo.c
+Index: b/usr/src/cmd/rpcinfo/rpcinfo.c
 ===================================================================
---- libc.orig/usr/src/cmd/rpcinfo/rpcinfo.c	2012-10-08 00:25:33.000000000 +0000
-+++ libc/usr/src/cmd/rpcinfo/rpcinfo.c	2013-03-07 17:13:00.547886648 +0000
+--- a/usr/src/cmd/rpcinfo/rpcinfo.c	2014-03-02 23:19:45.605877810 +0400
++++ b/usr/src/cmd/rpcinfo/rpcinfo.c	2014-03-02 23:23:49.965043854 +0400
 @@ -76,7 +76,9 @@
  #define	MAX_VERS	(4294967295UL)
  #define	UNKNOWN		"unknown"
diff --git a/libc/debian/patches/rstat.x-stdc.patch b/libc/debian/patches/rstat.x-stdc.patch
index 5f24e7c..e02a47d 100644
--- a/libc/debian/patches/rstat.x-stdc.patch
+++ b/libc/debian/patches/rstat.x-stdc.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/head/rpcsvc/rstat.x
+Index: b/usr/src/head/rpcsvc/rstat.x
 ===================================================================
---- libc.orig/usr/src/head/rpcsvc/rstat.x	2013-09-27 18:07:00.831925924 +0400
-+++ libc/usr/src/head/rpcsvc/rstat.x	2013-09-27 18:19:42.345521803 +0400
+--- a/usr/src/head/rpcsvc/rstat.x	2014-03-02 23:19:32.419553925 +0400
++++ b/usr/src/head/rpcsvc/rstat.x	2014-03-02 23:24:30.234790136 +0400
 @@ -72,13 +72,7 @@
  % */
  %
diff --git a/libc/debian/patches/rusers.x-stdc.patch b/libc/debian/patches/rusers.x-stdc.patch
index e081862..8bbb723 100644
--- a/libc/debian/patches/rusers.x-stdc.patch
+++ b/libc/debian/patches/rusers.x-stdc.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/head/rpcsvc/rusers.x
+Index: b/usr/src/head/rpcsvc/rusers.x
 ===================================================================
---- libc.orig/usr/src/head/rpcsvc/rusers.x	2013-09-27 18:07:01.243311538 +0400
-+++ libc/usr/src/head/rpcsvc/rusers.x	2013-09-27 18:21:06.429628029 +0400
+--- a/usr/src/head/rpcsvc/rusers.x	2014-03-02 23:19:31.842157239 +0400
++++ b/usr/src/head/rpcsvc/rusers.x	2014-03-02 23:24:32.444753523 +0400
 @@ -111,12 +111,7 @@
  %
  %int xdr_utmpidlearr();
diff --git a/libc/debian/patches/rwall.x-stdc.patch b/libc/debian/patches/rwall.x-stdc.patch
index 3411ab5..b5cab4e 100644
--- a/libc/debian/patches/rwall.x-stdc.patch
+++ b/libc/debian/patches/rwall.x-stdc.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/head/rpcsvc/rwall.x
+Index: b/usr/src/head/rpcsvc/rwall.x
 ===================================================================
---- libc.orig/usr/src/head/rpcsvc/rwall.x	2013-09-27 18:24:01.012139346 +0400
-+++ libc/usr/src/head/rpcsvc/rwall.x	2013-09-27 18:25:22.050269170 +0400
+--- a/usr/src/head/rpcsvc/rwall.x	2014-03-02 23:19:31.248453487 +0400
++++ b/usr/src/head/rpcsvc/rwall.x	2014-03-02 23:24:34.698874054 +0400
 @@ -60,10 +60,6 @@
  #ifdef RPC_HDR
  %
diff --git a/libc/debian/patches/sendfile-in-libc.patch b/libc/debian/patches/sendfile-in-libc.patch
index f3b6bb5..7432834 100644
--- a/libc/debian/patches/sendfile-in-libc.patch
+++ b/libc/debian/patches/sendfile-in-libc.patch
@@ -1,8 +1,8 @@
 Description: Move sendfile() and sendfilev() into libc
-Index: libc/usr/src/lib/libc/port/sys/sendfile.c
+Index: b/usr/src/lib/libc/port/sys/sendfile.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libc/usr/src/lib/libc/port/sys/sendfile.c	2013-07-19 21:12:59.657680838 +0400
++++ b/usr/src/lib/libc/port/sys/sendfile.c	2014-03-02 23:24:11.643087070 +0400
 @@ -0,0 +1,139 @@
 +
 +/*
@@ -143,11 +143,11 @@ Index: libc/usr/src/lib/libc/port/sys/sendfile.c
 +}
 +#endif
 +
-Index: libc/usr/src/lib/libc/i386/Makefile.com
+Index: b/usr/src/lib/libc/i386/Makefile.com
 ===================================================================
---- libc.orig/usr/src/lib/libc/i386/Makefile.com	2013-07-19 20:59:56.319940296 +0400
-+++ libc/usr/src/lib/libc/i386/Makefile.com	2013-07-19 21:10:59.705658215 +0400
-@@ -924,6 +924,7 @@
+--- a/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:24:04.755118425 +0400
++++ b/usr/src/lib/libc/i386/Makefile.com	2014-03-02 23:24:11.646472983 +0400
+@@ -928,6 +928,7 @@
  	rename.o		\
  	sbrk.o			\
  	semsys.o		\
@@ -155,11 +155,11 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com
  	set_errno.o		\
  	sharefs.o		\
  	shmsys.o		\
-Index: libc/usr/src/lib/libc/amd64/Makefile
+Index: b/usr/src/lib/libc/amd64/Makefile
 ===================================================================
---- libc.orig/usr/src/lib/libc/amd64/Makefile	2013-07-19 20:59:56.320036782 +0400
-+++ libc/usr/src/lib/libc/amd64/Makefile	2013-07-19 21:10:59.708076865 +0400
-@@ -886,6 +886,7 @@
+--- a/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:24:04.753022180 +0400
++++ b/usr/src/lib/libc/amd64/Makefile	2014-03-02 23:24:11.648948976 +0400
+@@ -890,6 +890,7 @@
  	rename.o		\
  	sbrk.o			\
  	semsys.o		\
@@ -167,11 +167,11 @@ Index: libc/usr/src/lib/libc/amd64/Makefile
  	set_errno.o		\
  	sharefs.o		\
  	shmsys.o		\
-Index: libc/usr/src/lib/libc/port/mapfile-vers
+Index: b/usr/src/lib/libc/port/mapfile-vers
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/mapfile-vers	2013-07-19 20:59:56.320016217 +0400
-+++ libc/usr/src/lib/libc/port/mapfile-vers	2013-07-19 21:10:59.712076783 +0400
-@@ -110,6 +110,12 @@
+--- a/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:24:04.762510308 +0400
++++ b/usr/src/lib/libc/port/mapfile-vers	2014-03-02 23:24:11.652848232 +0400
+@@ -145,6 +145,12 @@
          program_invocation_name;
          program_invocation_short_name;
          rawmemchr;
diff --git a/libc/debian/patches/series b/libc/debian/patches/series
index 3a09090..c5fba4a 100644
--- a/libc/debian/patches/series
+++ b/libc/debian/patches/series
@@ -43,7 +43,6 @@ objects-path.patch
 headers-limits.h-name-max.patch
 libnsl-gnu-make.patch
 sgs-crle-multiarch.patch
-illumos-72-libnsl-t_error.patch
 libc-nvpair.h.patch
 libc-uadmin-kiss.patch
 libnsl-avoid-libbsm.patch
@@ -57,9 +56,6 @@ libnsl-headers.patch
 sgs-libelf-headers.patch
 sgs-ld.patch
 libc-add-mempcpy.patch
-illumos-3436-relocatable-objects-also-need-sloppy-relocation.patch
-illumos-3439-discarded-sections-shouldn-t-end-up-on-output-l.patch
-illumos-3453-GNU-comdat-redirection-does-exactly-the-wrong-t.patch
 rename-libavl.patch
 thr_uberdata.h-avoid-libc_int.h.patch
 dyson-libc-add-gnu-error.patch
@@ -84,7 +80,6 @@ sendfile-in-libc.patch
 libc-enable-xpg6.patch
 libc-sprintf-nul-char.patch
 libc-add-get_current_dir_name.patch
-illumos-3787.patch
 libc-add-cfmakeraw.patch
 libsocket-binutils-2.23-weak.patch
 librpcsvc-use-system-x.patch
@@ -94,14 +89,10 @@ rwall.x-stdc.patch
 librpcsvc-usr-lib.patch
 librpcsvc-gnumake.patch
 libc-futimes.patch
-illumos-195-librpcsvc.patch
 #crt1.o-amd64-PIE.patch
 genassym-use-gnuld.patch
 binaries-use-gnu-ld.patch
 fnmatch-FNM_CASEFOLD.patch
-illumos-3141-strptime-t.patch
-illumos-3687-fopen-e.patch
-illumos-4294-fopen-x.patch
 libc-printf-q-length-modifier.patch
 libc-add-qsort_r.patch
 libc-add-mkostemp.patch
diff --git a/libc/debian/patches/sgs-crle-multiarch.patch b/libc/debian/patches/sgs-crle-multiarch.patch
index cba5ffa..f7642c9 100644
--- a/libc/debian/patches/sgs-crle-multiarch.patch
+++ b/libc/debian/patches/sgs-crle-multiarch.patch
@@ -4,10 +4,10 @@ Description: multiarch support for crle(1)
  a wrapper which execute the right version of crle, e. g.:
  /usr/lib/x86_64-illumos/crle for 64 bits, and
  /usr/lib32/crle for 32 bits on amd64 system.
-Index: libc/usr/src/cmd/sgs/crle/common/crle.c
+Index: b/usr/src/cmd/sgs/crle/common/crle.c
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/crle/common/crle.c	2012-10-19 13:55:51.048787918 +0400
-+++ libc/usr/src/cmd/sgs/crle/common/crle.c	2012-10-19 13:57:04.368515632 +0400
+--- a/usr/src/cmd/sgs/crle/common/crle.c	2014-03-02 23:20:07.818199406 +0400
++++ b/usr/src/cmd/sgs/crle/common/crle.c	2014-03-02 23:22:35.383534884 +0400
 @@ -137,6 +137,7 @@
  	crle.c_flags |= CRLE_ADDID;
  	crle.c_strbkts = 503;
@@ -111,10 +111,10 @@ Index: libc/usr/src/cmd/sgs/crle/common/crle.c
  
  		case 'A':			/* alternative is optional */
  			flag = RTC_OBJ_OPTINAL;
-Index: libc/usr/src/cmd/sgs/crle/common/crle.msg
+Index: b/usr/src/cmd/sgs/crle/common/crle.msg
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/crle/common/crle.msg	2012-10-19 13:55:51.048719984 +0400
-+++ libc/usr/src/cmd/sgs/crle/common/crle.msg	2012-10-19 13:57:04.369756046 +0400
+--- a/usr/src/cmd/sgs/crle/common/crle.msg	2014-03-02 23:20:07.818131549 +0400
++++ b/usr/src/cmd/sgs/crle/common/crle.msg	2014-03-02 23:22:35.385262036 +0400
 @@ -33,11 +33,10 @@
  
  # Argument usage messages.
@@ -199,10 +199,10 @@ Index: libc/usr/src/cmd/sgs/crle/common/crle.msg
  @ MSG_CMD_ALTER		"-a %s"
  @ MSG_CMD_OPTIONAL	"-A %s"
  @ MSG_CMD_CONF		"-c %s"
-Index: libc/usr/src/cmd/sgs/crle/Makefile.com
+Index: b/usr/src/cmd/sgs/crle/Makefile.com
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/crle/Makefile.com	2012-10-19 13:55:51.048845858 +0400
-+++ libc/usr/src/cmd/sgs/crle/Makefile.com	2012-10-19 13:57:04.371029829 +0400
+--- a/usr/src/cmd/sgs/crle/Makefile.com	2014-03-02 23:20:07.818078783 +0400
++++ b/usr/src/cmd/sgs/crle/Makefile.com	2014-03-02 23:22:35.386548028 +0400
 @@ -36,13 +36,15 @@
  
  OBJS=		$(BLTOBJ) $(COMOBJ) $(TOOLSOBJ)
@@ -224,10 +224,10 @@ Index: libc/usr/src/cmd/sgs/crle/Makefile.com
  LDFLAGS +=	$(VERSREF) $(CC_USE_PROTO) $(MAPOPT) \
  			$(LLDFLAGS) $(ZNOLAZYLOAD)
  LDLIBS +=	-lelf $(CONVLIBDIR) $(CONV_LIB) $(DLLIB)
-Index: libc/usr/src/cmd/sgs/crle/Makefile.targ
+Index: b/usr/src/cmd/sgs/crle/Makefile.targ
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/crle/Makefile.targ	2012-10-19 13:55:51.048904330 +0400
-+++ libc/usr/src/cmd/sgs/crle/Makefile.targ	2012-10-19 13:57:04.372060701 +0400
+--- a/usr/src/cmd/sgs/crle/Makefile.targ	2014-03-02 23:20:07.818233348 +0400
++++ b/usr/src/cmd/sgs/crle/Makefile.targ	2014-03-02 23:22:35.387645917 +0400
 @@ -29,8 +29,14 @@
  		$(COMPILE.c) $<
  		$(POST_PROCESS_O)
@@ -244,10 +244,10 @@ Index: libc/usr/src/cmd/sgs/crle/Makefile.targ
  
  all:		$(PROG)
  
-Index: libc/usr/src/cmd/sgs/crle/amd64/Makefile
+Index: b/usr/src/cmd/sgs/crle/amd64/Makefile
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/crle/amd64/Makefile	2012-10-19 13:55:51.048874361 +0400
-+++ libc/usr/src/cmd/sgs/crle/amd64/Makefile	2012-10-19 13:57:04.373193326 +0400
+--- a/usr/src/cmd/sgs/crle/amd64/Makefile	2014-03-02 23:20:07.817998905 +0400
++++ b/usr/src/cmd/sgs/crle/amd64/Makefile	2014-03-02 23:22:35.389272295 +0400
 @@ -38,6 +38,7 @@
  LINTFLAGS64 +=	$(VAR_LINTFLAGS64)
  
@@ -256,10 +256,10 @@ Index: libc/usr/src/cmd/sgs/crle/amd64/Makefile
  
  lint:		$(LINTOUT64)
  
-Index: libc/usr/src/cmd/sgs/crle/common/_crle.h
+Index: b/usr/src/cmd/sgs/crle/common/_crle.h
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/crle/common/_crle.h	2012-10-19 13:55:51.048758407 +0400
-+++ libc/usr/src/cmd/sgs/crle/common/_crle.h	2012-10-19 13:57:04.374128803 +0400
+--- a/usr/src/cmd/sgs/crle/common/_crle.h	2014-03-02 23:20:07.818155575 +0400
++++ b/usr/src/cmd/sgs/crle/common/_crle.h	2014-03-02 23:22:35.391170353 +0400
 @@ -154,6 +154,7 @@
  	APlist		*c_flt;		/* filter/filtee associations */
  	uint_t		c_fltrnum;	/*	and associated filter number */
@@ -268,10 +268,10 @@ Index: libc/usr/src/cmd/sgs/crle/common/_crle.h
  } Crle_desc;
  
  #define	CRLE_CREAT	0x0001		/* config file creation required */
-Index: libc/usr/src/cmd/sgs/crle/common/print.c
+Index: b/usr/src/cmd/sgs/crle/common/print.c
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/crle/common/print.c	2012-10-19 13:55:51.048816786 +0400
-+++ libc/usr/src/cmd/sgs/crle/common/print.c	2012-10-19 14:00:17.230111553 +0400
+--- a/usr/src/cmd/sgs/crle/common/print.c	2014-03-02 23:20:07.818177411 +0400
++++ b/usr/src/cmd/sgs/crle/common/print.c	2014-03-02 23:22:35.393731054 +0400
 @@ -38,6 +38,19 @@
  #include	"_crle.h"
  #include	"msg.h"
@@ -419,10 +419,10 @@ Index: libc/usr/src/cmd/sgs/crle/common/print.c
  
  				return (INSCFG_RET_OK);
  			}
-Index: libc/usr/src/man/man1/crle.1
+Index: b/usr/src/man/man1/crle.1
 ===================================================================
---- libc.orig/usr/src/man/man1/crle.1	2012-10-19 13:55:51.048661253 +0400
-+++ libc/usr/src/man/man1/crle.1	2012-10-19 13:57:04.377756089 +0400
+--- a/usr/src/man/man1/crle.1	2014-03-02 23:20:07.818255119 +0400
++++ b/usr/src/man/man1/crle.1	2014-03-02 23:22:35.396496036 +0400
 @@ -9,9 +9,9 @@
  .SH SYNOPSIS
  .LP
diff --git a/libc/debian/patches/sgs-install-libconv.patch b/libc/debian/patches/sgs-install-libconv.patch
index 8592321..273b3d3 100644
--- a/libc/debian/patches/sgs-install-libconv.patch
+++ b/libc/debian/patches/sgs-install-libconv.patch
@@ -1,10 +1,10 @@
 Description: install static convenient library,
  so the compiler will find proper version.
  This is needed to compile single (native) version of ldd
-Index: libc/usr/src/cmd/sgs/libconv/amd64/Makefile
+Index: b/usr/src/cmd/sgs/libconv/amd64/Makefile
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/libconv/amd64/Makefile	2012-09-30 20:41:16.000000000 +0400
-+++ libc/usr/src/cmd/sgs/libconv/amd64/Makefile	2012-10-07 15:50:14.200506636 +0400
+--- a/usr/src/cmd/sgs/libconv/amd64/Makefile	2014-03-02 23:20:11.999708012 +0400
++++ b/usr/src/cmd/sgs/libconv/amd64/Makefile	2014-03-02 23:22:20.781052463 +0400
 @@ -31,7 +31,9 @@
  .PARALLEL:	$(PICS)
  .KEEP_STATE:
@@ -16,10 +16,10 @@ Index: libc/usr/src/cmd/sgs/libconv/amd64/Makefile
  
  include 	../Makefile.targ
  include		../../Makefile.sub.64
-Index: libc/usr/src/cmd/sgs/libconv/i386/Makefile
+Index: b/usr/src/cmd/sgs/libconv/i386/Makefile
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/libconv/i386/Makefile	2012-09-30 20:41:16.000000000 +0400
-+++ libc/usr/src/cmd/sgs/libconv/i386/Makefile	2012-10-07 15:51:40.777583661 +0400
+--- a/usr/src/cmd/sgs/libconv/i386/Makefile	2014-03-02 23:20:11.999904955 +0400
++++ b/usr/src/cmd/sgs/libconv/i386/Makefile	2014-03-02 23:22:20.783637571 +0400
 @@ -31,6 +31,8 @@
  .PARALLEL:	$(PICS)
  .KEEP_STATE:
diff --git a/libc/debian/patches/sgs-ld.patch b/libc/debian/patches/sgs-ld.patch
index 159a0a8..f824827 100644
--- a/libc/debian/patches/sgs-ld.patch
+++ b/libc/debian/patches/sgs-ld.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/cmd/sgs/ld/Makefile.com
+Index: b/usr/src/cmd/sgs/ld/Makefile.com
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/ld/Makefile.com	2012-10-08 00:25:33.000000000 +0000
-+++ libc/usr/src/cmd/sgs/ld/Makefile.com	2012-11-15 03:16:49.778742832 +0000
+--- a/usr/src/cmd/sgs/ld/Makefile.com	2014-03-02 23:20:00.685852834 +0400
++++ b/usr/src/cmd/sgs/ld/Makefile.com	2014-03-02 23:23:10.729056700 +0400
 @@ -23,7 +23,7 @@
  # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved.
  #
@@ -22,10 +22,10 @@ Index: libc/usr/src/cmd/sgs/ld/Makefile.com
  
  CERRWARN +=	-_gcc=-Wno-switch
  CERRWARN +=	-_gcc=-Wno-parentheses
-Index: libc/usr/src/cmd/sgs/ld/Makefile.targ
+Index: b/usr/src/cmd/sgs/ld/Makefile.targ
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/ld/Makefile.targ	2012-10-08 00:25:33.000000000 +0000
-+++ libc/usr/src/cmd/sgs/ld/Makefile.targ	2012-11-15 03:16:49.780940737 +0000
+--- a/usr/src/cmd/sgs/ld/Makefile.targ	2014-03-02 23:20:00.685967658 +0400
++++ b/usr/src/cmd/sgs/ld/Makefile.targ	2014-03-02 23:23:10.730699751 +0400
 @@ -29,7 +29,7 @@
  all:		$(PROG)
  
@@ -35,10 +35,10 @@ Index: libc/usr/src/cmd/sgs/ld/Makefile.targ
  
  %.o:		../common/%.c
  		$(COMPILE.c) $<
-Index: libc/usr/src/cmd/sgs/ld/common/ld.c
+Index: b/usr/src/cmd/sgs/ld/common/ld.c
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/ld/common/ld.c	2012-10-08 00:25:33.000000000 +0000
-+++ libc/usr/src/cmd/sgs/ld/common/ld.c	2012-11-15 03:16:49.785520317 +0000
+--- a/usr/src/cmd/sgs/ld/common/ld.c	2014-03-02 23:20:00.685987631 +0400
++++ b/usr/src/cmd/sgs/ld/common/ld.c	2014-03-02 23:23:10.733028440 +0400
 @@ -313,14 +313,6 @@
  			break;
  
@@ -54,10 +54,10 @@ Index: libc/usr/src/cmd/sgs/ld/common/ld.c
  			/* -z target=platform */
  			if (strncmp(optarg, MSG_ORIG(MSG_ARG_TARGET),
  			    MSG_ARG_TARGET_SIZE) == 0) {
-Index: libc/usr/src/cmd/sgs/libld/common/libld.msg
+Index: b/usr/src/cmd/sgs/libld/common/libld.msg
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/libld/common/libld.msg	2012-10-08 00:25:33.000000000 +0000
-+++ libc/usr/src/cmd/sgs/libld/common/libld.msg	2012-11-15 03:16:49.792071999 +0000
+--- a/usr/src/cmd/sgs/libld/common/libld.msg	2014-03-02 23:20:00.686024074 +0400
++++ b/usr/src/cmd/sgs/libld/common/libld.msg	2014-03-02 23:23:10.737076971 +0400
 @@ -142,7 +142,6 @@
  			 allow extraction of\n\
  			 \t\t\tarchive members to resolve weak references from \
@@ -66,10 +66,10 @@ Index: libc/usr/src/cmd/sgs/libld/common/libld.msg
  @ MSG_ARG_DETAIL_ZADLIB	"\t[-z assert-deflib]\n\
  			\t\t\tenables warnings for linking with libraries in \
  			the \n\t\t\tdefault search path\n\
-Index: libc/usr/src/cmd/sgs/libld/common/args.c
+Index: b/usr/src/cmd/sgs/libld/common/args.c
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/libld/common/args.c	2012-10-08 00:25:33.000000000 +0000
-+++ libc/usr/src/cmd/sgs/libld/common/args.c	2012-11-15 03:16:49.796015232 +0000
+--- a/usr/src/cmd/sgs/libld/common/args.c	2014-03-02 23:20:00.686045460 +0400
++++ b/usr/src/cmd/sgs/libld/common/args.c	2014-03-02 23:23:10.739715819 +0400
 @@ -184,7 +184,6 @@
  	(void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_CY));
  	(void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZA));
@@ -78,16 +78,16 @@ Index: libc/usr/src/cmd/sgs/libld/common/args.c
  	(void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZADLIB));
  	(void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZC));
  	(void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZDEF));
-Index: libc/usr/src/man/man1/ld.1
+Index: b/usr/src/man/man1/ld.1
 ===================================================================
---- libc.orig/usr/src/man/man1/ld.1	2012-10-08 00:25:44.000000000 +0000
-+++ libc/usr/src/man/man1/ld.1	2012-11-15 03:57:09.850029068 +0000
+--- a/usr/src/man/man1/ld.1	2014-03-02 23:20:00.685788308 +0400
++++ b/usr/src/man/man1/ld.1	2014-03-02 23:23:10.745561031 +0400
 @@ -5,13 +5,13 @@
  .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License. You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.
  .\"  See the License for the specific language governing permissions and limitations under the License. When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with
  .\" the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
--.TH LD 1 "Sep 18, 2009"
-+.TH SUNLD 1 "Sep 18, 2009"
+-.TH LD 1 "Sep 10, 2013"
++.TH SUNLD 1 "Sep 10, 2013"
  .SH NAME
 -ld \- link-editor for object files
 +sunld \- link-editor for object files
@@ -108,7 +108,7 @@ Index: libc/usr/src/man/man1/ld.1
  [\fB-z\fR assert-deflib ] [ \fB-z\fR assert-deflib=\fIlibname\fR ]
  [\fB-z\fR combreloc | nocombreloc ] [\fB-z\fR defs | nodefs]
  [\fB-z\fR direct | nodirect] [\fB-z\fR endfiltee]
-@@ -40,10 +40,10 @@
+@@ -41,10 +41,10 @@
  .SH DESCRIPTION
  .sp
  .LP
@@ -122,7 +122,7 @@ Index: libc/usr/src/man/man1/ld.1
  default. See NOTES.
  .sp
  .LP
-@@ -63,12 +63,12 @@
+@@ -64,12 +64,12 @@
  .LP
  Dynamic linking is the most common model for combining relocatable objects, and
  the eventual creation of processes within Solaris. This environment tightly
@@ -137,7 +137,7 @@ Index: libc/usr/src/man/man1/ld.1
  once at the point the library is encountered on the argument list. The library
  can be either a shared object or relocatable archive. See \fBar.h\fR(3HEAD)).
  .sp
-@@ -83,8 +83,8 @@
+@@ -84,8 +84,8 @@
  See Chapter 4, \fIShared Objects,\fR in \fILinker and Libraries Guide\fR
  .sp
  .LP
@@ -148,7 +148,7 @@ Index: libc/usr/src/man/man1/ld.1
  archive library sequentially to resolve external references that can be
  satisfied by library members. This search is repeated until no external
  references can be resolved by the archive. Thus, the order of members in the
-@@ -95,8 +95,8 @@
+@@ -96,8 +96,8 @@
  Libraries Guide\fR.
  .sp
  .LP
@@ -159,7 +159,7 @@ Index: libc/usr/src/man/man1/ld.1
  the first relocatable object on the command line to govern the mode in which to
  operate. The mixing of 32-bit objects and 64-bit objects is not permitted.
  Similarly, only objects of a single machine type are allowed. See the
-@@ -136,7 +136,7 @@
+@@ -137,7 +137,7 @@
  With Solaris 10, 32-bit system archive libraries are no longer provided.
  Without these libraries, specifically \fBlibc.a\fR, the creation of static
  executables is no longer achievable without specialized system knowledge.
@@ -168,7 +168,7 @@ Index: libc/usr/src/man/man1/ld.1
  processing of archive libraries, remains unchanged.
  .SH OPTIONS
  .sp
-@@ -329,7 +329,7 @@
+@@ -330,7 +330,7 @@
  references to global symbols within shared objects are not bound until runtime,
  even if definitions are available. This model allows definitions of the same
  symbol in an executable or other shared object to override the object's own
@@ -177,7 +177,7 @@ Index: libc/usr/src/man/man1/ld.1
  \fBdefs\fR overrides.
  .sp
  The \fB-B\fR \fBsymbolic\fR option is intended for specialized dynamic objects
-@@ -367,8 +367,8 @@
+@@ -368,8 +368,8 @@
  .ad
  .sp .6
  .RS 4n
@@ -188,7 +188,7 @@ Index: libc/usr/src/man/man1/ld.1
  \fBStatic Executables\fR under DESCRIPTION, and \fB-B\fR
  \fBdynamic\fR|\fBstatic\fR.
  .RE
-@@ -495,7 +495,7 @@
+@@ -496,7 +496,7 @@
  When building an executable, uses \fIname\fR as the path name of the
  interpreter to be written into the program header. The default in static mode
  is no interpreter. In dynamic mode, the default is the name of the runtime
@@ -197,7 +197,7 @@ Index: libc/usr/src/man/man1/ld.1
  \fBexec\fR(2) loads this interpreter when the \fBa.out\fR is loaded, and passes
  control to the interpreter rather than to the \fBa.out\fR directly.
  .RE
-@@ -513,16 +513,16 @@
+@@ -514,16 +514,16 @@
  .RS 4n
  Searches a library \fBlib\fR\fIx\fR\fB\&.so\fR or \fBlib\fR\fIx\fR\fB\&.a\fR,
  the conventional names for shared object and archive libraries, respectively.
@@ -219,7 +219,7 @@ Index: libc/usr/src/man/man1/ld.1
  of \fB-l\fR is significant. See \fILinking With Additional Libraries\fR in
  \fILinker and Libraries Guide\fR.
  .RE
-@@ -538,7 +538,7 @@
+@@ -539,7 +539,7 @@
  .ad
  .sp .6
  .RS 4n
@@ -228,7 +228,7 @@ Index: libc/usr/src/man/man1/ld.1
  libraries first in any directories specified by the \fB-L\fR options and then
  in the standard directories. This option is useful only if the option precedes
  the \fB-l\fR options to which the \fB-L\fR option applies. See \fIDirectories
-@@ -568,7 +568,7 @@
+@@ -569,7 +569,7 @@
  .ad
  .sp .6
  .RS 4n
@@ -237,7 +237,7 @@ Index: libc/usr/src/man/man1/ld.1
  be specified multiple times. If \fImapfile\fR is a directory, then all regular
  files, as defined by \fBstat\fR(2), within the directory are processed. See
  Chapter 9, \fIMapfile Option,\fR in \fILinker and Libraries Guide\fR. Example
-@@ -644,9 +644,9 @@
+@@ -645,9 +645,9 @@
  .sp .6
  .RS 4n
  Under \fB-Q\fR \fBy\fR, an \fBident\fR string is added to the \fB\&.comment\fR
@@ -250,7 +250,7 @@ Index: libc/usr/src/man/man1/ld.1
  This identification is identical with the default action of the \fBcc\fR
  command. \fB-Q\fR \fBn\fR suppresses version identification. \fB\&.comment\fR
  sections can be manipulated by the \fBmcs\fR(1) utility.
-@@ -664,7 +664,7 @@
+@@ -665,7 +665,7 @@
  .sp .6
  .RS 4n
  Combines relocatable object files to produce one relocatable object file.
@@ -259,7 +259,7 @@ Index: libc/usr/src/man/man1/ld.1
  used with the \fB-a\fR option.
  .RE
  
-@@ -727,7 +727,7 @@
+@@ -728,7 +728,7 @@
  .ad
  .sp .6
  .RS 4n
@@ -268,7 +268,7 @@ Index: libc/usr/src/man/man1/ld.1
  information regarding the linking process. Shared objects that are defined by
  using the \fB-S\fR option can also be supplied using the \fBSGS_SUPPORT\fR
  environment variable. See \fILink-Editor Support Interface\fR in \fILinker and
-@@ -775,7 +775,7 @@
+@@ -776,7 +776,7 @@
  .ad
  .sp .6
  .RS 4n
@@ -277,7 +277,7 @@ Index: libc/usr/src/man/man1/ld.1
  .RE
  
  .sp
-@@ -829,26 +829,11 @@
+@@ -830,26 +830,11 @@
  .sp
  .ne 2
  .na
@@ -305,7 +305,7 @@ Index: libc/usr/src/man/man1/ld.1
  executables or shared objects. This section combination differs from
  relocatable objects, in which relocation sections are maintained in a
  one-to-one relationship with the sections to which the relocations must be
-@@ -856,7 +841,7 @@
+@@ -857,7 +842,7 @@
  relocation sections, and preserves the one-to-one relationship found in the
  original relocatable objects.
  .sp
@@ -314,7 +314,7 @@ Index: libc/usr/src/man/man1/ld.1
  reference. This sorting reduces runtime symbol lookup. When multiple relocation
  sections are combined, this sorting produces the least possible relocation
  overhead when objects are loaded into memory, and speeds the runtime loading of
-@@ -995,7 +980,7 @@
+@@ -996,7 +981,7 @@
  .sp
  An auditor established with the \fB-P\fR option and the \fB-z\fR
  \fBglobalaudit\fR option, is equivalent to the auditor being established with
@@ -323,7 +323,7 @@ Index: libc/usr/src/man/man1/ld.1
  .RE
  
  .sp
-@@ -1118,7 +1103,7 @@
+@@ -1215,7 +1200,7 @@
  .RS 4n
  The class of the link-editor is affected by the class of the output file being
  created and by the capabilities of the underlying operating system. The
@@ -332,7 +332,7 @@ Index: libc/usr/src/man/man1/ld.1
  link-editor argument. The defined argument is only interpreted, respectively,
  by the 32-bit class or 64-bit class of the link-editor.
  .sp
-@@ -1127,7 +1112,7 @@
+@@ -1224,7 +1209,7 @@
  .sp
  .in +2
  .nf
@@ -341,7 +341,7 @@ Index: libc/usr/src/man/man1/ld.1
  .fi
  .in -2
  .sp
-@@ -1135,7 +1120,7 @@
+@@ -1232,7 +1217,7 @@
  The class of link-editor that is invoked is determined from the \fBELF\fR class
  of the first relocatable file that is seen on the command line. This
  determination is carried out \fBprior\fR to any \fB-z\fR
@@ -350,7 +350,7 @@ Index: libc/usr/src/man/man1/ld.1
  .RE
  
  .sp
-@@ -1149,7 +1134,7 @@
+@@ -1246,7 +1231,7 @@
  runtime. Normally, filter processing is delayed until a symbol reference is
  bound to the filter. The runtime processing of an object that contains this
  flag mimics that which occurs if the \fBLD_LOADFLTR\fR environment variable is
@@ -359,7 +359,7 @@ Index: libc/usr/src/man/man1/ld.1
  .RE
  
  .sp
-@@ -1288,7 +1273,7 @@
+@@ -1385,7 +1370,7 @@
  Marks the object as requiring non-lazy runtime binding. This mode is similar to
  adding the object to the process by using \fBdlopen\fR(3C) with the
  \fBRTLD_NOW\fR mode. This mode is also similar to having the \fBLD_BIND_NOW\fR
@@ -368,7 +368,7 @@ Index: libc/usr/src/man/man1/ld.1
  .RE
  
  .sp
-@@ -1339,9 +1324,9 @@
+@@ -1436,9 +1421,9 @@
  .ad
  .sp .6
  .RS 4n
@@ -380,7 +380,7 @@ Index: libc/usr/src/man/man1/ld.1
  equivalent symbol in the COMDAT section that was kept. \fB-z\fR
  \fBrelaxreloc\fR is a specialized option, mainly of interest to compiler
  authors, and is not intended for general use.
-@@ -1422,7 +1407,7 @@
+@@ -1519,7 +1504,7 @@
  the first object encountered within the first archive processed from the
  command line. If there are no objects or archives, the link-editor assumes the
  native machine. This option is useful when creating an object directly with
@@ -389,7 +389,7 @@ Index: libc/usr/src/man/man1/ld.1
  It can also be useful in the rare case of linking entirely from an archive that
  contains objects of different machine types for which the first object is not
  of the desired machine type. See \fIThe 32-bit link-editor and 64-bit
-@@ -1539,7 +1524,7 @@
+@@ -1636,7 +1621,7 @@
  .ad
  .sp .6
  .RS 4n
@@ -398,7 +398,7 @@ Index: libc/usr/src/man/man1/ld.1
  this alternative link-editor. This environment variable provides a generic
  means of overriding the default link-editor that is called from the various
  compiler drivers. See the \fB-z altexec64\fR option.
-@@ -1564,11 +1549,11 @@
+@@ -1661,11 +1646,11 @@
  .in -2
  .sp
  
@@ -412,7 +412,7 @@ Index: libc/usr/src/man/man1/ld.1
  .fi
  .in -2
  .sp
-@@ -1615,13 +1600,13 @@
+@@ -1712,13 +1697,13 @@
  .ad
  .sp .6
  .RS 4n
@@ -430,7 +430,7 @@ Index: libc/usr/src/man/man1/ld.1
  .fi
  .in -2
  .sp
-@@ -1651,15 +1636,15 @@
+@@ -1748,15 +1733,15 @@
  link-editor and given information regarding the linking process. This
  environment variable can be specified with a _32 or _64 suffix. This makes the
  environment variable specific, respectively, to the 32-bit or 64-bit class of
@@ -449,7 +449,7 @@ Index: libc/usr/src/man/man1/ld.1
  .SH FILES
  .sp
  .ne 2
-@@ -1739,7 +1724,7 @@
+@@ -1836,7 +1821,7 @@
  .SH NOTES
  .sp
  .LP
@@ -458,7 +458,7 @@ Index: libc/usr/src/man/man1/ld.1
  today's programming environment, where dynamic objects dominate, alternative
  defaults would often make more sense. However, historic defaults must be
  maintained to ensure compatibility with existing program development
-@@ -1748,22 +1733,22 @@
+@@ -1845,22 +1830,22 @@
  \fILink-Editor Quick Reference,\fR in \fILinker and Libraries Guide\fR.
  .sp
  .LP
diff --git a/libc/debian/patches/sgs-ldd.patch b/libc/debian/patches/sgs-ldd.patch
index e3917b5..c3cc9a4 100644
--- a/libc/debian/patches/sgs-ldd.patch
+++ b/libc/debian/patches/sgs-ldd.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/cmd/sgs/ldd/Makefile.com
+Index: b/usr/src/cmd/sgs/ldd/Makefile.com
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/ldd/Makefile.com	2012-09-30 20:41:16.000000000 +0400
-+++ libc/usr/src/cmd/sgs/ldd/Makefile.com	2012-10-07 16:25:06.332683692 +0400
+--- a/usr/src/cmd/sgs/ldd/Makefile.com	2014-03-02 23:20:11.419146849 +0400
++++ b/usr/src/cmd/sgs/ldd/Makefile.com	2014-03-02 23:22:23.175962643 +0400
 @@ -35,16 +35,15 @@
  
  OBJS=		$(BLTOBJ) $(COMOBJ) $(TOOLSOBJ)
diff --git a/libc/debian/patches/sgs-lddstub.patch b/libc/debian/patches/sgs-lddstub.patch
index 091b5fc..0bff03a 100644
--- a/libc/debian/patches/sgs-lddstub.patch
+++ b/libc/debian/patches/sgs-lddstub.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/cmd/sgs/lddstub/Makefile.targ
+Index: b/usr/src/cmd/sgs/lddstub/Makefile.targ
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/lddstub/Makefile.targ	2012-10-07 18:41:42.734828092 +0400
-+++ libc/usr/src/cmd/sgs/lddstub/Makefile.targ	2012-10-07 19:01:32.923970931 +0400
+--- a/usr/src/cmd/sgs/lddstub/Makefile.targ	2014-03-02 23:20:10.865024931 +0400
++++ b/usr/src/cmd/sgs/lddstub/Makefile.targ	2014-03-02 23:22:25.398438761 +0400
 @@ -30,10 +30,16 @@
  
  all:		$(PROG)
@@ -19,10 +19,10 @@ Index: libc/usr/src/cmd/sgs/lddstub/Makefile.targ
  clean:
  		$(RM) $(OBJS) $(CLEANFILES)
  
-Index: libc/usr/src/cmd/sgs/lddstub/Makefile.com
+Index: b/usr/src/cmd/sgs/lddstub/Makefile.com
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/lddstub/Makefile.com	2012-10-07 18:41:42.734817823 +0400
-+++ libc/usr/src/cmd/sgs/lddstub/Makefile.com	2012-10-07 19:01:32.924259075 +0400
+--- a/usr/src/cmd/sgs/lddstub/Makefile.com	2014-03-02 23:20:10.865050128 +0400
++++ b/usr/src/cmd/sgs/lddstub/Makefile.com	2014-03-02 23:22:25.399941117 +0400
 @@ -35,8 +35,6 @@
  
  # As of Solaris 9 the kernel accepts $ORIGIN within the interpreter field.
@@ -32,10 +32,10 @@ Index: libc/usr/src/cmd/sgs/lddstub/Makefile.com
  ASFLAGS=	-P -D_ASM
  LDFLAGS=	$(VERSREF) $(INTERP) $(CONVLIBDIR) -lconv -e stub \
  		$(LDFLAGS.cmd)
-Index: libc/usr/src/cmd/sgs/lddstub/amd64/Makefile
+Index: b/usr/src/cmd/sgs/lddstub/amd64/Makefile
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/lddstub/amd64/Makefile	2012-10-07 18:41:42.734850887 +0400
-+++ libc/usr/src/cmd/sgs/lddstub/amd64/Makefile	2012-10-07 19:01:32.924595447 +0400
+--- a/usr/src/cmd/sgs/lddstub/amd64/Makefile	2014-03-02 23:20:10.865072114 +0400
++++ b/usr/src/cmd/sgs/lddstub/amd64/Makefile	2014-03-02 23:22:25.402446890 +0400
 @@ -34,7 +34,9 @@
  
  ASFLAGS +=	-D__amd64 $(amd64_AS_XARCH)
@@ -47,10 +47,10 @@ Index: libc/usr/src/cmd/sgs/lddstub/amd64/Makefile
  
  include		../Makefile.targ
  include		../../Makefile.sub.64
-Index: libc/usr/src/cmd/sgs/lddstub/i386/Makefile
+Index: b/usr/src/cmd/sgs/lddstub/i386/Makefile
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/lddstub/i386/Makefile	2012-10-07 18:41:42.734792847 +0400
-+++ libc/usr/src/cmd/sgs/lddstub/i386/Makefile	2012-10-07 19:01:32.924937379 +0400
+--- a/usr/src/cmd/sgs/lddstub/i386/Makefile	2014-03-02 23:20:10.864945648 +0400
++++ b/usr/src/cmd/sgs/lddstub/i386/Makefile	2014-03-02 23:22:25.404260135 +0400
 @@ -29,6 +29,9 @@
  
  .KEEP_STATE:
@@ -62,10 +62,10 @@ Index: libc/usr/src/cmd/sgs/lddstub/i386/Makefile
 +
  
  include		../Makefile.targ
-Index: libc/usr/src/cmd/sgs/libconv/common/lddstub.c
+Index: b/usr/src/cmd/sgs/libconv/common/lddstub.c
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/libconv/common/lddstub.c	2012-10-07 16:10:27.264531425 +0400
-+++ libc/usr/src/cmd/sgs/libconv/common/lddstub.c	2012-10-07 19:25:30.848288830 +0400
+--- a/usr/src/cmd/sgs/libconv/common/lddstub.c	2014-03-02 23:20:10.865136345 +0400
++++ b/usr/src/cmd/sgs/libconv/common/lddstub.c	2014-03-02 23:22:25.406457338 +0400
 @@ -31,27 +31,6 @@
  #include	"_conv.h"
  #include	"lddstub_msg.h"
@@ -144,10 +144,10 @@ Index: libc/usr/src/cmd/sgs/libconv/common/lddstub.c
 -	}
  	return (stub);
  }
-Index: libc/usr/src/cmd/sgs/libconv/Makefile.com
+Index: b/usr/src/cmd/sgs/libconv/Makefile.com
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/libconv/Makefile.com	2012-09-30 20:41:16.000000000 +0400
-+++ libc/usr/src/cmd/sgs/libconv/Makefile.com	2012-10-07 19:27:29.263944396 +0400
+--- a/usr/src/cmd/sgs/libconv/Makefile.com	2014-03-02 23:20:10.865112309 +0400
++++ b/usr/src/cmd/sgs/libconv/Makefile.com	2014-03-02 23:22:25.408112547 +0400
 @@ -100,6 +100,10 @@
  CPPFLAGS +=	-I$(SRCBASE)/lib/libc/inc -I$(ELFCAP) \
  		-I$(SRC)/common/sgsrtcid
diff --git a/libc/debian/patches/sgs-libconv-demangle.patch b/libc/debian/patches/sgs-libconv-demangle.patch
index fbcefb9..375ca0f 100644
--- a/libc/debian/patches/sgs-libconv-demangle.patch
+++ b/libc/debian/patches/sgs-libconv-demangle.patch
@@ -3,8 +3,8 @@ Description: disable demangling for a while
  are provided by libiberty.a (LGPL)
 Index: b/usr/src/cmd/sgs/libconv/common/demangle.c
 ===================================================================
---- a/usr/src/cmd/sgs/libconv/common/demangle.c	2012-09-30 22:01:55.127280425 +0400
-+++ b/usr/src/cmd/sgs/libconv/common/demangle.c	2012-09-30 22:04:25.096961240 +0400
+--- a/usr/src/cmd/sgs/libconv/common/demangle.c	2014-03-02 23:20:30.314816246 +0400
++++ b/usr/src/cmd/sgs/libconv/common/demangle.c	2014-03-02 23:21:21.348692130 +0400
 @@ -24,7 +24,6 @@
   */
  
diff --git a/libc/debian/patches/sgs-libconv-makefile.patch b/libc/debian/patches/sgs-libconv-makefile.patch
index 11a3bd8..469c7a8 100644
--- a/libc/debian/patches/sgs-libconv-makefile.patch
+++ b/libc/debian/patches/sgs-libconv-makefile.patch
@@ -1,9 +1,9 @@
 Description: Fixes for GNU make
 
-Index: libc/usr/src/cmd/sgs/libconv/Makefile.targ
+Index: b/usr/src/cmd/sgs/libconv/Makefile.targ
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/libconv/Makefile.targ	2012-10-08 04:25:33.000000000 +0400
-+++ libc/usr/src/cmd/sgs/libconv/Makefile.targ	2012-12-24 15:43:52.630581972 +0400
+--- a/usr/src/cmd/sgs/libconv/Makefile.targ	2014-03-02 23:20:29.718994841 +0400
++++ b/usr/src/cmd/sgs/libconv/Makefile.targ	2014-03-02 23:21:23.534729993 +0400
 @@ -24,20 +24,21 @@
  # Use is subject to license terms.
  #
diff --git a/libc/debian/patches/sgs-libdl-filter.patch b/libc/debian/patches/sgs-libdl-filter.patch
index 1819e6a..18c08b2 100644
--- a/libc/debian/patches/sgs-libdl-filter.patch
+++ b/libc/debian/patches/sgs-libdl-filter.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/cmd/sgs/libdl/amd64/Makefile
+Index: b/usr/src/cmd/sgs/libdl/amd64/Makefile
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/libdl/amd64/Makefile	2012-10-14 04:33:41.865009390 +0400
-+++ libc/usr/src/cmd/sgs/libdl/amd64/Makefile	2012-10-14 04:36:08.120704897 +0400
+--- a/usr/src/cmd/sgs/libdl/amd64/Makefile	2014-03-02 23:20:23.415310651 +0400
++++ b/usr/src/cmd/sgs/libdl/amd64/Makefile	2014-03-02 23:21:42.412771719 +0400
 @@ -27,7 +27,7 @@
  include		../Makefile.com
  include		$(SRC)/lib/Makefile.lib.64
@@ -11,10 +11,10 @@ Index: libc/usr/src/cmd/sgs/libdl/amd64/Makefile
  
  install:	all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64)
  
-Index: libc/usr/src/cmd/sgs/libdl/i386/Makefile
+Index: b/usr/src/cmd/sgs/libdl/i386/Makefile
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/libdl/i386/Makefile	2012-10-14 04:33:41.865067069 +0400
-+++ libc/usr/src/cmd/sgs/libdl/i386/Makefile	2012-10-14 04:35:50.654911992 +0400
+--- a/usr/src/cmd/sgs/libdl/i386/Makefile	2014-03-02 23:20:23.415181146 +0400
++++ b/usr/src/cmd/sgs/libdl/i386/Makefile	2014-03-02 23:21:42.414374754 +0400
 @@ -26,7 +26,7 @@
  include		$(SRC)/lib/Makefile.filter.com
  include		../Makefile.com
diff --git a/libc/debian/patches/sgs-libelf-gnu-make.patch b/libc/debian/patches/sgs-libelf-gnu-make.patch
index 5f9e39c..ee82589 100644
--- a/libc/debian/patches/sgs-libelf-gnu-make.patch
+++ b/libc/debian/patches/sgs-libelf-gnu-make.patch
@@ -1,8 +1,8 @@
 Index: b/usr/src/cmd/sgs/libelf/Makefile.com
 ===================================================================
---- a/usr/src/cmd/sgs/libelf/Makefile.com	2012-09-30 22:01:54.755688295 +0400
-+++ b/usr/src/cmd/sgs/libelf/Makefile.com	2012-09-30 22:04:26.781117861 +0400
-@@ -74,8 +74,8 @@
+--- a/usr/src/cmd/sgs/libelf/Makefile.com	2014-03-02 23:20:28.566583283 +0400
++++ b/usr/src/cmd/sgs/libelf/Makefile.com	2014-03-02 23:21:28.085915713 +0400
+@@ -72,8 +72,8 @@
  CERRWARN +=	-_gcc=-Wno-uninitialized
  
  BUILD.AR=	$(RM) $@ ; \
diff --git a/libc/debian/patches/sgs-libelf-headers.patch b/libc/debian/patches/sgs-libelf-headers.patch
index 746ba9a..6649a45 100644
--- a/libc/debian/patches/sgs-libelf-headers.patch
+++ b/libc/debian/patches/sgs-libelf-headers.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/cmd/sgs/libelf/common/data.c
+Index: b/usr/src/cmd/sgs/libelf/common/data.c
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/libelf/common/data.c	2012-10-08 00:25:33.000000000 +0000
-+++ libc/usr/src/cmd/sgs/libelf/common/data.c	2012-11-14 23:07:44.278587092 +0000
+--- a/usr/src/cmd/sgs/libelf/common/data.c	2014-03-02 23:20:01.333295914 +0400
++++ b/usr/src/cmd/sgs/libelf/common/data.c	2014-03-02 23:23:08.083867289 +0400
 @@ -27,6 +27,7 @@
  /*	Copyright (c) 1988 AT&T	*/
  /*	  All Rights Reserved  	*/
@@ -10,10 +10,10 @@ Index: libc/usr/src/cmd/sgs/libelf/common/data.c
  #include <libelf.h>
  #include "decl.h"
  
-Index: libc/usr/src/cmd/sgs/libelf/common/getbase.c
+Index: b/usr/src/cmd/sgs/libelf/common/getbase.c
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/libelf/common/getbase.c	2012-10-08 00:25:33.000000000 +0000
-+++ libc/usr/src/cmd/sgs/libelf/common/getbase.c	2012-11-14 23:10:58.033172907 +0000
+--- a/usr/src/cmd/sgs/libelf/common/getbase.c	2014-03-02 23:20:01.333128517 +0400
++++ b/usr/src/cmd/sgs/libelf/common/getbase.c	2014-03-02 23:23:08.085644574 +0400
 @@ -26,6 +26,7 @@
  /*	Copyright (c) 1988 AT&T	*/
  /*	  All Rights Reserved  	*/
@@ -22,10 +22,10 @@ Index: libc/usr/src/cmd/sgs/libelf/common/getbase.c
  #include <ar.h>
  #include "libelf.h"
  #include "decl.h"
-Index: libc/usr/src/cmd/sgs/libelf/common/rand.c
+Index: b/usr/src/cmd/sgs/libelf/common/rand.c
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/libelf/common/rand.c	2012-10-08 00:25:33.000000000 +0000
-+++ libc/usr/src/cmd/sgs/libelf/common/rand.c	2012-11-14 23:11:42.170322620 +0000
+--- a/usr/src/cmd/sgs/libelf/common/rand.c	2014-03-02 23:20:01.333259089 +0400
++++ b/usr/src/cmd/sgs/libelf/common/rand.c	2014-03-02 23:23:08.087837637 +0400
 @@ -26,6 +26,7 @@
  /*	Copyright (c) 1988 AT&T	*/
  /*	  All Rights Reserved  	*/
diff --git a/libc/debian/patches/sgs-libelf-no-demos.patch b/libc/debian/patches/sgs-libelf-no-demos.patch
index 0642468..f2ef2f6 100644
--- a/libc/debian/patches/sgs-libelf-no-demos.patch
+++ b/libc/debian/patches/sgs-libelf-no-demos.patch
@@ -1,7 +1,7 @@
 Index: b/usr/src/cmd/sgs/libelf/Makefile.targ
 ===================================================================
---- a/usr/src/cmd/sgs/libelf/Makefile.targ	2012-09-30 22:01:54.359456284 +0400
-+++ b/usr/src/cmd/sgs/libelf/Makefile.targ	2012-09-30 22:04:28.116915778 +0400
+--- a/usr/src/cmd/sgs/libelf/Makefile.targ	2014-03-02 23:20:26.796470095 +0400
++++ b/usr/src/cmd/sgs/libelf/Makefile.targ	2014-03-02 23:21:32.557946261 +0400
 @@ -46,7 +46,6 @@
  
  install:	all .WAIT $(ROOTFS_LIBS) $(ROOTFS_LINKS) \
diff --git a/libc/debian/patches/sgs-libelf-nolint.patch b/libc/debian/patches/sgs-libelf-nolint.patch
index 9a8a140..563ff7a 100644
--- a/libc/debian/patches/sgs-libelf-nolint.patch
+++ b/libc/debian/patches/sgs-libelf-nolint.patch
@@ -1,7 +1,7 @@
 Index: b/usr/src/cmd/sgs/libelf/Makefile.targ
 ===================================================================
---- a/usr/src/cmd/sgs/libelf/Makefile.targ	2012-09-30 22:04:28.116915778 +0400
-+++ b/usr/src/cmd/sgs/libelf/Makefile.targ	2012-09-30 22:04:28.687798374 +0400
+--- a/usr/src/cmd/sgs/libelf/Makefile.targ	2014-03-02 23:21:32.557946261 +0400
++++ b/usr/src/cmd/sgs/libelf/Makefile.targ	2014-03-02 23:21:34.836649526 +0400
 @@ -44,9 +44,7 @@
  
  all:		$(BLTSRCS) .WAIT $(LIBS) $(LIBLINKS)
diff --git a/libc/debian/patches/sgs-libelf-rename.patch b/libc/debian/patches/sgs-libelf-rename.patch
index 5acf923..5d9cbb5 100644
--- a/libc/debian/patches/sgs-libelf-rename.patch
+++ b/libc/debian/patches/sgs-libelf-rename.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/cmd/sgs/libelf/Makefile.com
+Index: b/usr/src/cmd/sgs/libelf/Makefile.com
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/libelf/Makefile.com	2012-10-02 01:28:18.717892621 +0400
-+++ libc/usr/src/cmd/sgs/libelf/Makefile.com	2012-10-02 01:28:18.785171799 +0400
+--- a/usr/src/cmd/sgs/libelf/Makefile.com	2014-03-02 23:21:28.085915713 +0400
++++ b/usr/src/cmd/sgs/libelf/Makefile.com	2014-03-02 23:21:30.399934056 +0400
 @@ -22,7 +22,7 @@
  # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved.
  #
diff --git a/libc/debian/patches/sgs-libld-lib64.patch b/libc/debian/patches/sgs-libld-lib64.patch
index 1d2df97..f75f33a 100644
--- a/libc/debian/patches/sgs-libld-lib64.patch
+++ b/libc/debian/patches/sgs-libld-lib64.patch
@@ -1,7 +1,7 @@
 Index: b/usr/src/cmd/sgs/libld/amd64/Makefile
 ===================================================================
---- a/usr/src/cmd/sgs/libld/amd64/Makefile	2012-09-30 22:01:53.889429427 +0400
-+++ b/usr/src/cmd/sgs/libld/amd64/Makefile	2012-09-30 22:04:29.255620796 +0400
+--- a/usr/src/cmd/sgs/libld/amd64/Makefile	2014-03-02 23:20:25.174452572 +0400
++++ b/usr/src/cmd/sgs/libld/amd64/Makefile	2014-03-02 23:21:37.117948024 +0400
 @@ -30,8 +30,6 @@
  
  .KEEP_STATE:
diff --git a/libc/debian/patches/sgs-liblddbg-lib64.patch b/libc/debian/patches/sgs-liblddbg-lib64.patch
index afedd4c..e4af536 100644
--- a/libc/debian/patches/sgs-liblddbg-lib64.patch
+++ b/libc/debian/patches/sgs-liblddbg-lib64.patch
@@ -1,7 +1,7 @@
 Index: b/usr/src/cmd/sgs/liblddbg/amd64/Makefile
 ===================================================================
---- a/usr/src/cmd/sgs/liblddbg/amd64/Makefile	2012-09-30 22:01:54.879596612 +0400
-+++ b/usr/src/cmd/sgs/liblddbg/amd64/Makefile	2012-09-30 22:04:26.231254711 +0400
+--- a/usr/src/cmd/sgs/liblddbg/amd64/Makefile	2014-03-02 23:20:29.154033990 +0400
++++ b/usr/src/cmd/sgs/liblddbg/amd64/Makefile	2014-03-02 23:21:25.821402123 +0400
 @@ -25,8 +25,6 @@
  
  include		../Makefile.com
diff --git a/libc/debian/patches/sgs-librtld_db-nolint.patch b/libc/debian/patches/sgs-librtld_db-nolint.patch
index 7cb586d..542fd29 100644
--- a/libc/debian/patches/sgs-librtld_db-nolint.patch
+++ b/libc/debian/patches/sgs-librtld_db-nolint.patch
@@ -1,7 +1,7 @@
 Index: b/usr/src/cmd/sgs/librtld_db/amd64/Makefile
 ===================================================================
---- a/usr/src/cmd/sgs/librtld_db/amd64/Makefile	2012-09-30 22:01:53.041127525 +0400
-+++ b/usr/src/cmd/sgs/librtld_db/amd64/Makefile	2012-09-30 22:04:33.588743894 +0400
+--- a/usr/src/cmd/sgs/librtld_db/amd64/Makefile	2014-03-02 23:20:20.498060270 +0400
++++ b/usr/src/cmd/sgs/librtld_db/amd64/Makefile	2014-03-02 23:21:52.277471788 +0400
 @@ -40,7 +40,6 @@
  all:		$(DYNLIB) $(LINTLIB)
  
@@ -12,8 +12,8 @@ Index: b/usr/src/cmd/sgs/librtld_db/amd64/Makefile
  		$(COMPILE.c) -D_ELF32 $(PICFLAGS) -o $@ \
 Index: b/usr/src/cmd/sgs/librtld_db/i386/Makefile
 ===================================================================
---- a/usr/src/cmd/sgs/librtld_db/i386/Makefile	2012-09-30 22:01:53.041183315 +0400
-+++ b/usr/src/cmd/sgs/librtld_db/i386/Makefile	2012-09-30 22:04:33.589625197 +0400
+--- a/usr/src/cmd/sgs/librtld_db/i386/Makefile	2014-03-02 23:20:20.497925937 +0400
++++ b/usr/src/cmd/sgs/librtld_db/i386/Makefile	2014-03-02 23:21:52.279211284 +0400
 @@ -38,7 +38,6 @@
  all:		$(DYNLIB) $(LINTLIB)
  
diff --git a/libc/debian/patches/sgs-rtld-default-lib-path.patch b/libc/debian/patches/sgs-rtld-default-lib-path.patch
index 3b6e9d1..6b02a3b 100644
--- a/libc/debian/patches/sgs-rtld-default-lib-path.patch
+++ b/libc/debian/patches/sgs-rtld-default-lib-path.patch
@@ -1,10 +1,10 @@
 Description: set default library search path
  with respect to multiarch, these changes must be
  consistent with crle.
-Index: libc/usr/src/cmd/sgs/rtld/common/elf.c
+Index: b/usr/src/cmd/sgs/rtld/common/elf.c
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/rtld/common/elf.c	2012-10-18 00:50:12.103782023 +0400
-+++ libc/usr/src/cmd/sgs/rtld/common/elf.c	2012-10-18 16:46:02.236929082 +0400
+--- a/usr/src/cmd/sgs/rtld/common/elf.c	2014-03-02 23:21:39.343226118 +0400
++++ b/usr/src/cmd/sgs/rtld/common/elf.c	2014-03-02 23:22:18.316177185 +0400
 @@ -52,24 +52,40 @@
  /*
   * Default and secure dependency search paths.
@@ -57,10 +57,10 @@ Index: libc/usr/src/cmd/sgs/rtld/common/elf.c
  #endif
  	{ 0, 0 }
  };
-Index: libc/usr/src/cmd/sgs/rtld/Makefile.com
+Index: b/usr/src/cmd/sgs/rtld/Makefile.com
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/rtld/Makefile.com	2012-10-08 04:25:33.000000000 +0400
-+++ libc/usr/src/cmd/sgs/rtld/Makefile.com	2012-10-18 00:50:15.143119479 +0400
+--- a/usr/src/cmd/sgs/rtld/Makefile.com	2014-03-02 23:20:12.607823579 +0400
++++ b/usr/src/cmd/sgs/rtld/Makefile.com	2014-03-02 23:22:18.317870585 +0400
 @@ -81,6 +81,14 @@
  		-I$(ELFCAP) \
  		 $(CPPFEATUREMACROS)
diff --git a/libc/debian/patches/sgs-rtld.patch b/libc/debian/patches/sgs-rtld.patch
index 1bd2fdf..7896355 100644
--- a/libc/debian/patches/sgs-rtld.patch
+++ b/libc/debian/patches/sgs-rtld.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/cmd/sgs/rtld/Makefile.targ
+Index: b/usr/src/cmd/sgs/rtld/Makefile.targ
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/rtld/Makefile.targ	2012-10-08 04:25:33.000000000 +0400
-+++ libc/usr/src/cmd/sgs/rtld/Makefile.targ	2012-10-15 02:21:56.539058071 +0400
+--- a/usr/src/cmd/sgs/rtld/Makefile.targ	2014-03-02 23:20:24.556673985 +0400
++++ b/usr/src/cmd/sgs/rtld/Makefile.targ	2014-03-02 23:21:39.333190091 +0400
 @@ -67,7 +67,7 @@
  		$(POST_PROCESS_O)
  
@@ -11,10 +11,10 @@ Index: libc/usr/src/cmd/sgs/rtld/Makefile.targ
  		    $(LDLIBS) $(CRTN)
  		$(POST_PROCESS_SO)
  
-Index: libc/usr/src/cmd/sgs/rtld/amd64/Makefile
+Index: b/usr/src/cmd/sgs/rtld/amd64/Makefile
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/rtld/amd64/Makefile	2012-10-08 04:25:33.000000000 +0400
-+++ libc/usr/src/cmd/sgs/rtld/amd64/Makefile	2012-10-15 02:21:56.539708401 +0400
+--- a/usr/src/cmd/sgs/rtld/amd64/Makefile	2014-03-02 23:20:24.556633363 +0400
++++ b/usr/src/cmd/sgs/rtld/amd64/Makefile	2014-03-02 23:21:39.335141630 +0400
 @@ -69,7 +69,7 @@
  ADBSUB=		$(ADBSUB64)
  CPPFLAGS +=	-D_ELF64
@@ -24,10 +24,10 @@ Index: libc/usr/src/cmd/sgs/rtld/amd64/Makefile
  
  SGSMSGTARG +=	$(SGSMSGINTEL) $(SGSMSGINTEL64) $(SGSMSG64)
  
-Index: libc/usr/src/cmd/sgs/rtld/i386/Makefile
+Index: b/usr/src/cmd/sgs/rtld/i386/Makefile
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/rtld/i386/Makefile	2012-10-08 04:25:33.000000000 +0400
-+++ libc/usr/src/cmd/sgs/rtld/i386/Makefile	2012-10-15 02:21:56.540420836 +0400
+--- a/usr/src/cmd/sgs/rtld/i386/Makefile	2014-03-02 23:20:24.556694285 +0400
++++ b/usr/src/cmd/sgs/rtld/i386/Makefile	2014-03-02 23:21:39.336660680 +0400
 @@ -66,7 +66,7 @@
  ADBGENCFLAGS +=	-erroff=%all
  ADBGENFLAGS +=	-milp32
@@ -37,10 +37,10 @@ Index: libc/usr/src/cmd/sgs/rtld/i386/Makefile
  
  SGSMSGTARG +=	$(SGSMSGINTEL) $(SGSMSGINTEL32) $(SGSMSG32)
  
-Index: libc/usr/src/cmd/sgs/rtld/Makefile
+Index: b/usr/src/cmd/sgs/rtld/Makefile
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/rtld/Makefile	2012-10-08 04:25:33.000000000 +0400
-+++ libc/usr/src/cmd/sgs/rtld/Makefile	2012-10-15 02:21:56.540945869 +0400
+--- a/usr/src/cmd/sgs/rtld/Makefile	2014-03-02 23:20:24.556654825 +0400
++++ b/usr/src/cmd/sgs/rtld/Makefile	2014-03-02 23:21:39.337810957 +0400
 @@ -25,6 +25,6 @@
  
  include		$(SRC)/cmd/sgs/Makefile.com
@@ -49,10 +49,10 @@ Index: libc/usr/src/cmd/sgs/rtld/Makefile
 +EXTRASUBDIRS =
  
  include		$(SRC)/cmd/sgs/Makefile.sub
-Index: libc/usr/src/cmd/sgs/rtld/common/elf.c
+Index: b/usr/src/cmd/sgs/rtld/common/elf.c
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/rtld/common/elf.c	2012-10-15 03:29:12.706632817 +0400
-+++ libc/usr/src/cmd/sgs/rtld/common/elf.c	2012-10-15 03:31:52.650597069 +0400
+--- a/usr/src/cmd/sgs/rtld/common/elf.c	2014-03-02 23:20:24.556576260 +0400
++++ b/usr/src/cmd/sgs/rtld/common/elf.c	2014-03-02 23:21:39.343226118 +0400
 @@ -139,9 +139,9 @@
  	if (((*name == '/') &&
  	/* BEGIN CSTYLED */
diff --git a/libc/debian/patches/sgs.h-no-libelf.h.patch b/libc/debian/patches/sgs.h-no-libelf.h.patch
index 9bdc15f..d339220 100644
--- a/libc/debian/patches/sgs.h-no-libelf.h.patch
+++ b/libc/debian/patches/sgs.h-no-libelf.h.patch
@@ -1,10 +1,10 @@
 Descriptions: libelf.h is not used
  but sgs tries system libelf.h (/usr/include) and
  does not search debian/tmp/usr/include
-Index: libc/usr/src/cmd/sgs/include/sgs.h
+Index: b/usr/src/cmd/sgs/include/sgs.h
 ===================================================================
---- libc.orig/usr/src/cmd/sgs/include/sgs.h	2012-10-06 18:22:36.902719587 +0400
-+++ libc/usr/src/cmd/sgs/include/sgs.h	2012-10-06 18:23:20.860030708 +0400
+--- a/usr/src/cmd/sgs/include/sgs.h	2014-03-02 23:20:13.161704014 +0400
++++ b/usr/src/cmd/sgs/include/sgs.h	2014-03-02 23:22:16.062957036 +0400
 @@ -48,7 +48,6 @@
  #include <sys/machelf.h>
  #include <stdlib.h>
diff --git a/libc/debian/patches/stdio.h-includes-features.h.patch b/libc/debian/patches/stdio.h-includes-features.h.patch
index 5945665..1d9257a 100644
--- a/libc/debian/patches/stdio.h-includes-features.h.patch
+++ b/libc/debian/patches/stdio.h-includes-features.h.patch
@@ -1,8 +1,8 @@
 Description: We need __EXTENSIONS__ if _GNU_SOURCE is defined
-Index: libc/usr/src/head/stdio.h
+Index: b/usr/src/head/stdio.h
 ===================================================================
---- libc.orig/usr/src/head/stdio.h	2012-10-08 00:25:37.000000000 +0000
-+++ libc/usr/src/head/stdio.h	2013-03-08 02:29:38.437476311 +0000
+--- a/usr/src/head/stdio.h	2014-03-02 23:19:47.246291390 +0400
++++ b/usr/src/head/stdio.h	2014-03-02 23:23:45.069580816 +0400
 @@ -33,7 +33,7 @@
  #ifndef _STDIO_H
  #define	_STDIO_H
diff --git a/libc/debian/patches/stdlib-includes-alloca.patch b/libc/debian/patches/stdlib-includes-alloca.patch
index 2526451..cda54fb 100644
--- a/libc/debian/patches/stdlib-includes-alloca.patch
+++ b/libc/debian/patches/stdlib-includes-alloca.patch
@@ -1,8 +1,8 @@
-Index: libc/usr/src/head/stdlib.h
+Index: b/usr/src/head/stdlib.h
 ===================================================================
---- libc.orig/usr/src/head/stdlib.h	2012-10-08 00:25:37.000000000 +0000
-+++ libc/usr/src/head/stdlib.h	2013-03-05 22:39:02.813534443 +0000
-@@ -36,6 +36,11 @@
+--- a/usr/src/head/stdlib.h	2014-03-02 23:19:53.286343415 +0400
++++ b/usr/src/head/stdlib.h	2014-03-02 23:23:31.363268917 +0400
+@@ -40,6 +40,11 @@
  #include <sys/wait.h>
  #endif
  
diff --git a/libc/debian/patches/syslog-LOG_PERROR.patch b/libc/debian/patches/syslog-LOG_PERROR.patch
index 99d15b0..ebcced3 100644
--- a/libc/debian/patches/syslog-LOG_PERROR.patch
+++ b/libc/debian/patches/syslog-LOG_PERROR.patch
@@ -1,9 +1,9 @@
 Descriptio: logging to stderr
  output is slightly different from glibc (timestamp added)
-Index: libc/usr/src/lib/libc/port/gen/syslog.c
+Index: b/usr/src/lib/libc/port/gen/syslog.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/gen/syslog.c	2014-02-16 00:22:46.507682463 +0400
-+++ libc/usr/src/lib/libc/port/gen/syslog.c	2014-02-16 01:19:57.042136105 +0400
+--- a/usr/src/lib/libc/port/gen/syslog.c	2014-03-02 23:19:19.858555990 +0400
++++ b/usr/src/lib/libc/port/gen/syslog.c	2014-03-02 23:25:08.655297839 +0400
 @@ -338,9 +338,7 @@
  	dat.buf = outline;
  
@@ -31,10 +31,10 @@ Index: libc/usr/src/lib/libc/port/gen/syslog.c
  	nowait = (LogStat & LOG_NOWAIT);
  	pid = forkx(nowait? 0 : (FORK_NOSIGCHLD | FORK_WAITPID));
  	if (pid == -1)
-Index: libc/usr/src/head/syslog.h
+Index: b/usr/src/head/syslog.h
 ===================================================================
---- libc.orig/usr/src/head/syslog.h	2014-02-16 00:02:42.476650797 +0400
-+++ libc/usr/src/head/syslog.h	2014-02-16 00:49:19.900083616 +0400
+--- a/usr/src/head/syslog.h	2014-03-02 23:25:06.418599375 +0400
++++ b/usr/src/head/syslog.h	2014-03-02 23:25:08.656855035 +0400
 @@ -32,6 +32,10 @@
  #include <sys/syslog.h>
  #include <sys/va_list.h>
diff --git a/libc/debian/patches/syslog-names.patch b/libc/debian/patches/syslog-names.patch
index 17548f9..c80944e 100644
--- a/libc/debian/patches/syslog-names.patch
+++ b/libc/debian/patches/syslog-names.patch
@@ -1,7 +1,7 @@
-Index: libc/usr/src/head/syslog.h
+Index: b/usr/src/head/syslog.h
 ===================================================================
---- libc.orig/usr/src/head/syslog.h	2012-10-08 04:25:37.000000000 +0400
-+++ libc/usr/src/head/syslog.h	2014-02-16 00:02:42.476650797 +0400
+--- a/usr/src/head/syslog.h	2014-03-02 23:19:20.953217594 +0400
++++ b/usr/src/head/syslog.h	2014-03-02 23:25:06.418599375 +0400
 @@ -28,10 +28,70 @@
  
  #pragma ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.1	*/
diff --git a/libc/debian/patches/thr_uberdata.h-avoid-libc_int.h.patch b/libc/debian/patches/thr_uberdata.h-avoid-libc_int.h.patch
index 3544280..8b447f7 100644
--- a/libc/debian/patches/thr_uberdata.h-avoid-libc_int.h.patch
+++ b/libc/debian/patches/thr_uberdata.h-avoid-libc_int.h.patch
@@ -1,8 +1,8 @@
-Index: libc/usr/src/lib/libc/inc/thr_uberdata.h
+Index: b/usr/src/lib/libc/inc/thr_uberdata.h
 ===================================================================
---- libc.orig/usr/src/lib/libc/inc/thr_uberdata.h	2012-10-08 00:25:38.000000000 +0000
-+++ libc/usr/src/lib/libc/inc/thr_uberdata.h	2013-02-14 21:28:39.277727427 +0000
-@@ -52,7 +52,6 @@
+--- a/usr/src/lib/libc/inc/thr_uberdata.h	2014-03-02 23:19:57.522493278 +0400
++++ b/usr/src/lib/libc/inc/thr_uberdata.h	2014-03-02 23:23:19.394987202 +0400
+@@ -55,7 +55,6 @@
  #include <sys/priocntl.h>
  #include <thread_db.h>
  #include <setjmp.h>
@@ -10,11 +10,11 @@ Index: libc/usr/src/lib/libc/inc/thr_uberdata.h
  #include "tdb_agent.h"
  #include "thr_debug.h"
  
-Index: libc/usr/src/lib/libc/port/threads/thr.c
+Index: b/usr/src/lib/libc/port/threads/thr.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/threads/thr.c	2012-10-08 00:25:38.000000000 +0000
-+++ libc/usr/src/lib/libc/port/threads/thr.c	2013-02-14 21:34:51.426016304 +0000
-@@ -30,6 +30,7 @@
+--- a/usr/src/lib/libc/port/threads/thr.c	2014-03-02 23:19:57.522661392 +0400
++++ b/usr/src/lib/libc/port/threads/thr.c	2014-03-02 23:23:19.400256995 +0400
+@@ -33,6 +33,7 @@
  #include <sys/uio.h>
  #include <ctype.h>
  #include "libc.h"
@@ -22,10 +22,10 @@ Index: libc/usr/src/lib/libc/port/threads/thr.c
  
  /*
   * These symbols should not be exported from libc, but
-Index: libc/usr/src/lib/libc/port/threads/thread_interface.c
+Index: b/usr/src/lib/libc/port/threads/thread_interface.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/threads/thread_interface.c	2012-10-08 00:25:38.000000000 +0000
-+++ libc/usr/src/lib/libc/port/threads/thread_interface.c	2013-02-14 21:35:51.836295285 +0000
+--- a/usr/src/lib/libc/port/threads/thread_interface.c	2014-03-02 23:19:57.522616453 +0400
++++ b/usr/src/lib/libc/port/threads/thread_interface.c	2014-03-02 23:23:19.402018451 +0400
 @@ -26,6 +26,7 @@
  
  #include "lint.h"
@@ -34,10 +34,10 @@ Index: libc/usr/src/lib/libc/port/threads/thread_interface.c
  
  extern	int	_ti_bind_guard();
  extern	int	_ti_bind_clear();
-Index: libc/usr/src/lib/libc/port/threads/tls.c
+Index: b/usr/src/lib/libc/port/threads/tls.c
 ===================================================================
---- libc.orig/usr/src/lib/libc/port/threads/tls.c	2012-10-08 00:25:38.000000000 +0000
-+++ libc/usr/src/lib/libc/port/threads/tls.c	2013-02-14 21:36:27.662962794 +0000
+--- a/usr/src/lib/libc/port/threads/tls.c	2014-03-02 23:19:57.522684372 +0400
++++ b/usr/src/lib/libc/port/threads/tls.c	2014-03-02 23:23:19.403610849 +0400
 @@ -26,6 +26,7 @@
  
  #include "lint.h"
diff --git a/libc/debian/patches/unistd-add-environ.patch b/libc/debian/patches/unistd-add-environ.patch
index ff8a0b5..eb20ca0 100644
--- a/libc/debian/patches/unistd-add-environ.patch
+++ b/libc/debian/patches/unistd-add-environ.patch
@@ -1,8 +1,8 @@
-Index: libc/usr/src/head/unistd.h
+Index: b/usr/src/head/unistd.h
 ===================================================================
---- libc.orig/usr/src/head/unistd.h	2014-02-11 18:13:25.815320477 +0400
-+++ libc/usr/src/head/unistd.h	2014-02-12 21:17:45.467869102 +0400
-@@ -29,7 +29,7 @@
+--- a/usr/src/head/unistd.h	2014-03-02 23:24:19.242793108 +0400
++++ b/usr/src/head/unistd.h	2014-03-02 23:24:59.607324620 +0400
+@@ -33,7 +33,7 @@
  #ifndef _UNISTD_H
  #define	_UNISTD_H
  
@@ -11,7 +11,7 @@ Index: libc/usr/src/head/unistd.h
  
  #include <sys/types.h>
  #include <sys/unistd.h>
-@@ -1029,6 +1029,9 @@
+@@ -1129,6 +1129,9 @@
  #endif /* __GNUC__ */
  #endif
  
diff --git a/libc/debian/patches/zic-gnu-make-workaround.patch b/libc/debian/patches/zic-gnu-make-workaround.patch
index 2ce7060..828d2bd 100644
--- a/libc/debian/patches/zic-gnu-make-workaround.patch
+++ b/libc/debian/patches/zic-gnu-make-workaround.patch
@@ -1,8 +1,8 @@
 Index: b/usr/src/cmd/zic/Makefile
 ===================================================================
---- a/usr/src/cmd/zic/Makefile	2012-09-30 22:01:52.799594258 +0400
-+++ b/usr/src/cmd/zic/Makefile	2012-09-30 22:04:34.814531753 +0400
-@@ -90,7 +90,7 @@
+--- a/usr/src/cmd/zic/Makefile	2014-03-02 23:20:19.933626343 +0400
++++ b/usr/src/cmd/zic/Makefile	2014-03-02 23:21:54.779021172 +0400
+@@ -94,7 +94,7 @@
  
  lint: lint_SRCS
  
diff --git a/libc/debian/patches/zic-only-zic.patch b/libc/debian/patches/zic-only-zic.patch
index 7c1568f..38e9212 100644
--- a/libc/debian/patches/zic-only-zic.patch
+++ b/libc/debian/patches/zic-only-zic.patch
@@ -1,12 +1,13 @@
 Index: b/usr/src/cmd/zic/Makefile
 ===================================================================
---- a/usr/src/cmd/zic/Makefile	2012-09-30 22:04:34.814531753 +0400
-+++ b/usr/src/cmd/zic/Makefile	2012-09-30 22:04:35.385241480 +0400
-@@ -58,8 +58,7 @@
+--- a/usr/src/cmd/zic/Makefile	2014-03-02 23:21:54.779021172 +0400
++++ b/usr/src/cmd/zic/Makefile	2014-03-02 23:21:56.986130604 +0400
+@@ -61,9 +61,7 @@
  	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
  	$(POST_PROCESS)
  
--install: all $(DIRS) $(ROOTTZSRCD) $(ROOTTZTABD) $(ROOTUSRSBINPROG) $(ROOTLIBTZSRCFILES) $(ROOTLIBTZTABFILES) $(ROOTKSHPROG)
+-install: all $(DIRS) $(ROOTTZSRCD) $(ROOTTZTABD) $(ROOTUSRSBINPROG) \
+-		$(ROOTLIBTZSRCFILES) $(ROOTLIBTZTABFILES) $(ROOTKSHPROG)
 -	$(NPROG) -d $(ROOTTZD) $(TZFILES)
 +install: all $(ROOTUSRSBINPROG)
author	Igor Pashev <pashev.igor@gmail.com>	2014-03-02 23:28:12 +0400
committer	Igor Pashev <pashev.igor@gmail.com>	2014-03-02 23:28:12 +0400
commit	f7b1409c7351d68c15dc7ef208323fcbac34966d (patch)
tree	2932987627b89afc408424b95d01d1c15a7fce54 /libc/debian
parent	39b7e5055c452b7b84967bd0938e3c8f96c5cfb1 (diff)
download	illumos-packaging-f7b1409c7351d68c15dc7ef208323fcbac34966d.tar.gz