diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2017-06-18 17:00:48 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2017-06-18 17:00:48 +0300 |
| commit | 405f3a664d1d1a27f2e1b4d9bf323de8c86ea73c (patch) | |
| tree | 384f24335204be963ae64b662d3b8d317e511ec2 | |
| parent | e711ffe2dd148a50dce89f3c77be2726569cac01 (diff) | |
| download | illumos-packaging-405f3a664d1d1a27f2e1b4d9bf323de8c86ea73c.tar.gz | |
libc: refresh patches
140 files changed, 1144 insertions, 1144 deletions
diff --git a/libc/debian/patches/TZDIR.patch b/libc/debian/patches/TZDIR.patch index b68bc32..0e3c426 100644 --- a/libc/debian/patches/TZDIR.patch +++ b/libc/debian/patches/TZDIR.patch @@ -1,8 +1,8 @@ Description: Debian default -Index: libc/usr/src/lib/libc/port/gen/localtime.c +Index: b/usr/src/lib/libc/port/gen/localtime.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/gen/localtime.c -+++ libc/usr/src/lib/libc/port/gen/localtime.c +--- a/usr/src/lib/libc/port/gen/localtime.c ++++ b/usr/src/lib/libc/port/gen/localtime.c @@ -90,6 +90,10 @@ #pragma weak _tzset = tzset diff --git a/libc/debian/patches/__time_t.patch b/libc/debian/patches/__time_t.patch index 0397165..c600393 100644 --- a/libc/debian/patches/__time_t.patch +++ b/libc/debian/patches/__time_t.patch @@ -1,8 +1,8 @@ -Index: libc/usr/src/head/time.h +Index: b/usr/src/head/time.h =================================================================== ---- libc.orig/usr/src/head/time.h -+++ libc/usr/src/head/time.h -@@ -41,6 +41,11 @@ +--- a/usr/src/head/time.h ++++ b/usr/src/head/time.h +@@ -43,6 +43,11 @@ #include <sys/time_impl.h> #endif /* (!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX)) ... */ diff --git a/libc/debian/patches/add-TEMP_FAILURE_RETRY.patch b/libc/debian/patches/add-TEMP_FAILURE_RETRY.patch index 2ac013d..3965f9c 100644 --- a/libc/debian/patches/add-TEMP_FAILURE_RETRY.patch +++ b/libc/debian/patches/add-TEMP_FAILURE_RETRY.patch @@ -1,10 +1,10 @@ Index: b/usr/src/head/unistd.h =================================================================== ---- 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)... */ +--- a/usr/src/head/unistd.h ++++ b/usr/src/head/unistd.h +@@ -714,6 +714,19 @@ extern char *ttyname_r(int, char *, int) + extern int getentropy(void *, size_t); + #endif /* !_STRICT_SYMBOLS */ +#if defined(_GNU_SOURCE) || defined(__EXTENSIONS__) +#ifdef __GNUC__ diff --git a/libc/debian/patches/add-libutil-openpty-forkpty.patch b/libc/debian/patches/add-libutil-openpty-forkpty.patch index d5c0b9d..3b4818b 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 2014-04-03 17:24:29.623483638 +0400 +--- /dev/null ++++ b/usr/src/head/pty.h @@ -0,0 +1,39 @@ +/* +Copyright: 2013, Igor Pashev <pashev.igor@gmail.com> @@ -47,11 +47,11 @@ 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 2014-03-01 16:18:08.000000000 +0400 -+++ libc/usr/src/head/utmp.h 2014-04-03 17:24:29.625791330 +0400 -@@ -171,6 +171,10 @@ +--- a/usr/src/head/utmp.h ++++ b/usr/src/head/utmp.h +@@ -161,6 +161,10 @@ extern int utmpname(const char *); #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 2014-04-03 17:24:29.629342650 +0400 +--- /dev/null ++++ b/usr/src/lib/libutil/Makefile @@ -0,0 +1,23 @@ +include ../Makefile.lib + @@ -90,11 +90,11 @@ 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 2014-04-03 17:24:29.125012636 +0400 -+++ libc/usr/src/head/Makefile 2014-04-03 17:24:29.632216889 +0400 -@@ -141,6 +141,7 @@ +--- a/usr/src/head/Makefile ++++ b/usr/src/head/Makefile +@@ -149,6 +149,7 @@ HDRS= $($(MACH)_HDRS) $(ATTRDB_HDRS) prof.h \ project.h \ pthread.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 2014-04-03 17:24:29.633941296 +0400 +--- /dev/null ++++ b/usr/src/lib/libutil/Makefile.com @@ -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 2014-04-03 17:24:29.636608264 +0400 +--- /dev/null ++++ b/usr/src/lib/libutil/amd64/Makefile @@ -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 2014-04-03 17:24:29.639352545 +0400 +--- /dev/null ++++ b/usr/src/lib/libutil/i386/Makefile @@ -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 2014-04-03 17:24:29.641860042 +0400 +--- /dev/null ++++ b/usr/src/lib/libutil/common/login_tty.c @@ -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 2014-04-17 16:48:07.146808221 +0400 +--- /dev/null ++++ b/usr/src/lib/libutil/common/pty.c @@ -0,0 +1,143 @@ +/*- + * Copyright (c) 1990, 1993, 1994 @@ -352,10 +352,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 2014-04-03 17:24:29.645244888 +0400 +--- /dev/null ++++ b/usr/src/lib/libutil/common/mapfile-vers @@ -0,0 +1,11 @@ +$mapfile_version 2 + diff --git a/libc/debian/patches/add-memrchr.patch b/libc/debian/patches/add-memrchr.patch index f75926e..41dfbc4 100644 --- a/libc/debian/patches/add-memrchr.patch +++ b/libc/debian/patches/add-memrchr.patch @@ -1,8 +1,8 @@ Index: b/usr/src/head/string.h =================================================================== ---- 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 @@ +--- a/usr/src/head/string.h ++++ b/usr/src/head/string.h +@@ -140,6 +140,7 @@ extern char *strdup(const char *); #if defined(__EXTENSIONS__) || defined(_GNU_SOURCE) #define __mempcpy mempcpy extern void *mempcpy(void *, const void *, size_t); @@ -12,9 +12,9 @@ Index: b/usr/src/head/string.h #if defined(__EXTENSIONS__) || \ Index: b/usr/src/lib/libc/amd64/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/amd64/Makefile ++++ b/usr/src/lib/libc/amd64/Makefile +@@ -460,6 +460,7 @@ PORTGEN= \ memalign.o \ memmem.o \ mempcpy.o \ @@ -24,9 +24,9 @@ Index: b/usr/src/lib/libc/amd64/Makefile mkfifo.o \ Index: b/usr/src/lib/libc/i386/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/i386/Makefile.com ++++ b/usr/src/lib/libc/i386/Makefile.com +@@ -493,6 +493,7 @@ PORTGEN= \ memalign.o \ memmem.o \ mempcpy.o \ @@ -36,9 +36,9 @@ Index: b/usr/src/lib/libc/i386/Makefile.com mkfifo.o \ Index: b/usr/src/lib/libc/port/mapfile-vers =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers +@@ -276,6 +276,7 @@ SYMBOL_VERSION DYSON_1 { error_print_progname; flock; mempcpy; @@ -48,8 +48,8 @@ Index: b/usr/src/lib/libc/port/mapfile-vers } ILLUMOS_0.3; Index: b/usr/src/lib/libc/port/gen/memrchr.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/usr/src/lib/libc/port/gen/memrchr.c 2014-03-02 23:23:35.779333256 +0400 +--- /dev/null ++++ b/usr/src/lib/libc/port/gen/memrchr.c @@ -0,0 +1,18 @@ +#include<string.h> + diff --git a/libc/debian/patches/add-rawmemchr.patch b/libc/debian/patches/add-rawmemchr.patch index bbcca08..779e45b 100644 --- a/libc/debian/patches/add-rawmemchr.patch +++ b/libc/debian/patches/add-rawmemchr.patch @@ -1,7 +1,7 @@ Index: b/usr/src/lib/libc/amd64/gen/rawmemchr.s =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/usr/src/lib/libc/amd64/gen/rawmemchr.s 2014-03-02 23:23:38.862271501 +0400 +--- /dev/null ++++ b/usr/src/lib/libc/amd64/gen/rawmemchr.s @@ -0,0 +1,96 @@ +/* + * CDDL HEADER START @@ -101,9 +101,9 @@ Index: b/usr/src/lib/libc/amd64/gen/rawmemchr.s + SET_SIZE(rawmemchr) Index: b/usr/src/lib/libc/amd64/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/amd64/Makefile ++++ b/usr/src/lib/libc/amd64/Makefile +@@ -129,6 +129,7 @@ GENOBJS= \ new_list.o \ proc64_id.o \ proc64_support.o \ @@ -113,9 +113,9 @@ Index: b/usr/src/lib/libc/amd64/Makefile siglongjmp.o \ Index: b/usr/src/lib/libc/port/mapfile-vers =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers +@@ -279,6 +279,7 @@ SYMBOL_VERSION DYSON_1 { memrchr; program_invocation_name; program_invocation_short_name; @@ -125,8 +125,8 @@ Index: b/usr/src/lib/libc/port/mapfile-vers SYMBOL_VERSION ILLUMOS_0.3 { # Illumos additions Index: b/usr/src/lib/libc/i386/gen/rawmemchr.s =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/usr/src/lib/libc/i386/gen/rawmemchr.s 2014-03-02 23:23:38.870961891 +0400 +--- /dev/null ++++ b/usr/src/lib/libc/i386/gen/rawmemchr.s @@ -0,0 +1,100 @@ +/* + * CDDL HEADER START @@ -230,9 +230,9 @@ Index: b/usr/src/lib/libc/i386/gen/rawmemchr.s + SET_SIZE(rawmemchr) Index: b/usr/src/lib/libc/i386/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/i386/Makefile.com ++++ b/usr/src/lib/libc/i386/Makefile.com +@@ -139,6 +139,7 @@ GENOBJS= \ memcpy.o \ memset.o \ new_list.o \ @@ -242,9 +242,9 @@ Index: b/usr/src/lib/libc/i386/Makefile.com siglongjmp.o \ Index: b/usr/src/head/string.h =================================================================== ---- 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 @@ +--- a/usr/src/head/string.h ++++ b/usr/src/head/string.h +@@ -141,6 +141,7 @@ extern char *strdup(const char *); #define __mempcpy mempcpy extern void *mempcpy(void *, const void *, size_t); extern void *memrchr(const void *, int, size_t); diff --git a/libc/debian/patches/binaries-use-gnu-ld.patch b/libc/debian/patches/binaries-use-gnu-ld.patch index 51b4e02..bd6f4dc 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 -+++ libc/usr/src/cmd/sgs/ld/Makefile.com +--- a/usr/src/cmd/sgs/ld/Makefile.com ++++ b/usr/src/cmd/sgs/ld/Makefile.com @@ -34,7 +34,6 @@ BLTOBJ = msg.o 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 -+++ libc/usr/src/cmd/Makefile.cmd +--- a/usr/src/cmd/Makefile.cmd ++++ b/usr/src/cmd/Makefile.cmd @@ -508,3 +508,10 @@ CLOBBERFILES += $(XPG4) $(XPG6) $(DCFILE # 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 -+++ libc/usr/src/cmd/sgs/lddstub/i386/Makefile +--- a/usr/src/cmd/sgs/lddstub/i386/Makefile ++++ b/usr/src/cmd/sgs/lddstub/i386/Makefile @@ -29,6 +29,8 @@ include ../Makefile.com .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 -+++ libc/usr/src/cmd/sgs/lddstub/Makefile.com +--- a/usr/src/cmd/sgs/lddstub/Makefile.com ++++ b/usr/src/cmd/sgs/lddstub/Makefile.com @@ -36,5 +36,5 @@ include ../../Makefile.com # 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 092e02a..43f7dbb 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 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 @@ +--- a/usr/src/lib/libc/i386/Makefile.com ++++ b/usr/src/lib/libc/i386/Makefile.com +@@ -1272,7 +1272,7 @@ $(LIB_PIC): pics $$(PICS) $(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 595ac26..9aa679e 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 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 +--- a/usr/src/lib/libc/port/gen/crypt.c ++++ b/usr/src/lib/libc/port/gen/crypt.c @@ -61,13 +61,10 @@ #define CRYPT_CONFLINELENGTH 1024 @@ -19,7 +19,7 @@ Index: b/usr/src/lib/libc/port/gen/crypt.c #endif /* _LP64 */ /* -@@ -756,21 +753,9 @@ +@@ -756,21 +753,9 @@ isa_path(const char *path) free(ret); return (NULL); } @@ -44,9 +44,9 @@ 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 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 @@ +--- a/usr/src/lib/libc/Makefile.targ ++++ b/usr/src/lib/libc/Makefile.targ +@@ -299,3 +299,10 @@ pics/%.o: $(LIBCBASE)/../port/threads/%. $(POST_PROCESS_O) include $(SRC)/lib/Makefile.targ @@ -59,9 +59,9 @@ 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 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 @@ +--- a/usr/src/lib/crypt_modules/Makefile.crypt_modules ++++ b/usr/src/lib/crypt_modules/Makefile.crypt_modules +@@ -34,7 +34,7 @@ LIBS= $(DYNLIB) CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT diff --git a/libc/debian/patches/define-getdomainname.patch b/libc/debian/patches/define-getdomainname.patch index f487207..22030ed 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-04-02 18:48:40.166372612 +0400 -+++ libc/usr/src/head/unistd.h 2014-04-02 18:51:30.307758766 +0400 -@@ -1133,6 +1133,13 @@ +--- a/usr/src/head/unistd.h ++++ b/usr/src/head/unistd.h +@@ -733,6 +733,13 @@ extern int getentropy(void *, size_t); 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 5cb38cd..561431a 100644 --- a/libc/debian/patches/dyson-libc-add-gnu-error.patch +++ b/libc/debian/patches/dyson-libc-add-gnu-error.patch @@ -1,8 +1,8 @@ Index: b/usr/src/head/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/head/Makefile ++++ b/usr/src/head/Makefile +@@ -67,6 +67,7 @@ HDRS= $($(MACH)_HDRS) $(ATTRDB_HDRS) elf.h \ err.h \ errno.h \ @@ -12,8 +12,8 @@ Index: b/usr/src/head/Makefile exacct_impl.h \ Index: b/usr/src/head/error.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/usr/src/head/error.h 2014-03-02 23:23:22.195657123 +0400 +--- /dev/null ++++ b/usr/src/head/error.h @@ -0,0 +1,44 @@ +/* +Copyright: 2013, Igor Pashev <pashev.igor@gmail.com> @@ -61,9 +61,9 @@ Index: b/usr/src/head/error.h + Index: b/usr/src/lib/libc/amd64/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/amd64/Makefile ++++ b/usr/src/lib/libc/amd64/Makefile +@@ -116,6 +116,7 @@ GENOBJS= \ cuexit.o \ ecvt.o \ errlst.o \ @@ -73,9 +73,9 @@ Index: b/usr/src/lib/libc/amd64/Makefile lock.o \ Index: b/usr/src/lib/libc/i386/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/i386/Makefile.com ++++ b/usr/src/lib/libc/i386/Makefile.com +@@ -123,6 +123,7 @@ GENOBJS= \ cuexit.o \ ecvt.o \ errlst.o \ @@ -85,8 +85,8 @@ Index: b/usr/src/lib/libc/i386/Makefile.com ldivide.o \ Index: b/usr/src/lib/libc/port/gen/error.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/usr/src/lib/libc/port/gen/error.c 2014-03-02 23:23:22.205582658 +0400 +--- /dev/null ++++ b/usr/src/lib/libc/port/gen/error.c @@ -0,0 +1,94 @@ +/* +Copyright: 2013, Igor Pashev <pashev.igor@gmail.com> @@ -184,9 +184,9 @@ Index: b/usr/src/lib/libc/port/gen/error.c + Index: b/usr/src/lib/libc/port/mapfile-vers =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers +@@ -269,7 +269,14 @@ $endif SYMBOL_VERSION DYSON_1 { global: @@ -203,8 +203,8 @@ Index: b/usr/src/lib/libc/port/mapfile-vers SYMBOL_VERSION ILLUMOS_0.3 { # Illumos additions Index: b/usr/src/lib/libc/port/gen/err.c =================================================================== ---- 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 +--- a/usr/src/lib/libc/port/gen/err.c ++++ b/usr/src/lib/libc/port/gen/err.c @@ -40,6 +40,8 @@ /* Function exit/warning functions and global variables. */ @@ -214,7 +214,7 @@ Index: b/usr/src/lib/libc/port/gen/err.c #define PROGNAMESIZE 128 /* buffer size for __progname */ -@@ -64,6 +66,9 @@ +@@ -64,6 +66,9 @@ setprogname(const char *argv0) udp->progname = lmalloc(PROGNAMESIZE); (void) strlcpy(udp->progname, progname, PROGNAMESIZE); __progname = udp->progname; @@ -226,8 +226,8 @@ Index: b/usr/src/lib/libc/port/gen/err.c /* called only from libc_init() */ Index: b/usr/src/head/errno.h =================================================================== ---- 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 +--- a/usr/src/head/errno.h ++++ b/usr/src/head/errno.h @@ -44,6 +44,11 @@ extern "C" { #endif diff --git a/libc/debian/patches/etc-timezone.patch b/libc/debian/patches/etc-timezone.patch index a0bafd5..13c3c5e 100644 --- a/libc/debian/patches/etc-timezone.patch +++ b/libc/debian/patches/etc-timezone.patch @@ -1,8 +1,8 @@ Descriptiob: get TZ from /etc/timezone (like in Debian) -Index: libc/usr/src/lib/libc/port/gen/localtime.c +Index: b/usr/src/lib/libc/port/gen/localtime.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/gen/localtime.c -+++ libc/usr/src/lib/libc/port/gen/localtime.c +--- a/usr/src/lib/libc/port/gen/localtime.c ++++ b/usr/src/lib/libc/port/gen/localtime.c @@ -120,8 +120,8 @@ /* JAN_01_1902 cast to (int) - negative number of seconds from 1970 */ #define JAN_01_1902 (int)0x8017E880 diff --git a/libc/debian/patches/execvpe.patch b/libc/debian/patches/execvpe.patch index ecac78a..a0f889e 100644 --- a/libc/debian/patches/execvpe.patch +++ b/libc/debian/patches/execvpe.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/lib/libc/port/gen/execvp.c +Index: b/usr/src/lib/libc/port/gen/execvp.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/gen/execvp.c -+++ libc/usr/src/lib/libc/port/gen/execvp.c +--- a/usr/src/lib/libc/port/gen/execvp.c ++++ b/usr/src/lib/libc/port/gen/execvp.c @@ -104,7 +104,7 @@ execlp(const char *name, const char *arg } @@ -49,11 +49,11 @@ Index: libc/usr/src/lib/libc/port/gen/execvp.c static const char * execat(const char *s1, const char *s2, char *si) { -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 -+++ libc/usr/src/lib/libc/port/mapfile-vers -@@ -129,6 +129,7 @@ SYMBOL_VERSION DYSON_1 { +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers +@@ -269,6 +269,7 @@ SYMBOL_VERSION DYSON_1 { error_message_count; error_one_per_line; error_print_progname; @@ -61,11 +61,11 @@ Index: libc/usr/src/lib/libc/port/mapfile-vers flock; fts_children; fts_close; -Index: libc/usr/src/head/unistd.h +Index: b/usr/src/head/unistd.h =================================================================== ---- libc.orig/usr/src/head/unistd.h -+++ libc/usr/src/head/unistd.h -@@ -291,6 +291,9 @@ extern int execlp(const char *, const ch +--- a/usr/src/head/unistd.h ++++ b/usr/src/head/unistd.h +@@ -290,6 +290,9 @@ extern int execlp(const char *, const ch extern int execv(const char *, char *const *); extern int execve(const char *, char *const *, char *const *); extern int execvp(const char *, char *const *); diff --git a/libc/debian/patches/features.patch b/libc/debian/patches/features.patch index 2d923ea..4762c69 100644 --- a/libc/debian/patches/features.patch +++ b/libc/debian/patches/features.patch @@ -4,10 +4,10 @@ quilt new features.patch grep -rnH '#include.*<sys/feature_tests.h' usr/src/head/ -l | xargs quilt add grep -rnH '#include.*<sys/feature_tests.h' usr/src/head/ -l | xargs sed -i -r 's,#include <sys/feature_tests.h>,#include <features.h>,' -Index: libc/usr/src/head/aio.h +Index: b/usr/src/head/aio.h =================================================================== ---- libc.orig/usr/src/head/aio.h -+++ libc/usr/src/head/aio.h +--- a/usr/src/head/aio.h ++++ b/usr/src/head/aio.h @@ -29,7 +29,7 @@ #ifndef _AIO_H #define _AIO_H @@ -17,10 +17,10 @@ Index: libc/usr/src/head/aio.h #include <sys/types.h> #include <sys/fcntl.h> #include <sys/siginfo.h> -Index: libc/usr/src/head/arpa/inet.h +Index: b/usr/src/head/arpa/inet.h =================================================================== ---- libc.orig/usr/src/head/arpa/inet.h -+++ libc/usr/src/head/arpa/inet.h +--- a/usr/src/head/arpa/inet.h ++++ b/usr/src/head/arpa/inet.h @@ -37,7 +37,7 @@ #ifndef _ARPA_INET_H #define _ARPA_INET_H @@ -30,10 +30,10 @@ Index: libc/usr/src/head/arpa/inet.h #if !defined(_XPG4_2) || defined(_XPG6) || defined(__EXTENSIONS__) #include <sys/socket.h> -Index: libc/usr/src/head/dirent.h +Index: b/usr/src/head/dirent.h =================================================================== ---- libc.orig/usr/src/head/dirent.h -+++ libc/usr/src/head/dirent.h +--- a/usr/src/head/dirent.h ++++ b/usr/src/head/dirent.h @@ -32,7 +32,7 @@ #ifndef _DIRENT_H #define _DIRENT_H @@ -43,10 +43,10 @@ Index: libc/usr/src/head/dirent.h #include <sys/types.h> #include <sys/dirent.h> -Index: libc/usr/src/head/dlfcn.h +Index: b/usr/src/head/dlfcn.h =================================================================== ---- libc.orig/usr/src/head/dlfcn.h -+++ libc/usr/src/head/dlfcn.h +--- a/usr/src/head/dlfcn.h ++++ b/usr/src/head/dlfcn.h @@ -30,7 +30,7 @@ #ifndef _DLFCN_H #define _DLFCN_H @@ -56,10 +56,10 @@ Index: libc/usr/src/head/dlfcn.h #include <sys/types.h> #if !defined(_XOPEN_SOURCE) || defined(__EXTENSIONS__) #include <sys/auxv.h> -Index: libc/usr/src/head/fcntl.h +Index: b/usr/src/head/fcntl.h =================================================================== ---- libc.orig/usr/src/head/fcntl.h -+++ libc/usr/src/head/fcntl.h +--- a/usr/src/head/fcntl.h ++++ b/usr/src/head/fcntl.h @@ -32,7 +32,7 @@ #ifndef _FCNTL_H #define _FCNTL_H @@ -69,10 +69,10 @@ Index: libc/usr/src/head/fcntl.h #if defined(__EXTENSIONS__) || defined(_XPG4) #include <sys/stat.h> #endif -Index: libc/usr/src/head/float.h +Index: b/usr/src/head/float.h =================================================================== ---- libc.orig/usr/src/head/float.h -+++ libc/usr/src/head/float.h +--- a/usr/src/head/float.h ++++ b/usr/src/head/float.h @@ -33,7 +33,7 @@ #ifndef _FLOAT_H #define _FLOAT_H @@ -82,10 +82,10 @@ Index: libc/usr/src/head/float.h #ifdef __cplusplus extern "C" { -Index: libc/usr/src/head/fmtmsg.h +Index: b/usr/src/head/fmtmsg.h =================================================================== ---- libc.orig/usr/src/head/fmtmsg.h -+++ libc/usr/src/head/fmtmsg.h +--- a/usr/src/head/fmtmsg.h ++++ b/usr/src/head/fmtmsg.h @@ -33,7 +33,7 @@ #ifndef _FMTMSG_H #define _FMTMSG_H @@ -95,10 +95,10 @@ Index: libc/usr/src/head/fmtmsg.h #ifdef __cplusplus extern "C" { -Index: libc/usr/src/head/ftw.h +Index: b/usr/src/head/ftw.h =================================================================== ---- libc.orig/usr/src/head/ftw.h -+++ libc/usr/src/head/ftw.h +--- a/usr/src/head/ftw.h ++++ b/usr/src/head/ftw.h @@ -32,7 +32,7 @@ #ifndef _FTW_H #define _FTW_H @@ -108,10 +108,10 @@ Index: libc/usr/src/head/ftw.h #include <sys/types.h> #include <sys/stat.h> -Index: libc/usr/src/head/gelf.h +Index: b/usr/src/head/gelf.h =================================================================== ---- libc.orig/usr/src/head/gelf.h -+++ libc/usr/src/head/gelf.h +--- a/usr/src/head/gelf.h ++++ b/usr/src/head/gelf.h @@ -29,7 +29,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" @@ -121,10 +121,10 @@ Index: libc/usr/src/head/gelf.h #include <libelf.h> #include <sys/link.h> -Index: libc/usr/src/head/glob.h +Index: b/usr/src/head/glob.h =================================================================== ---- libc.orig/usr/src/head/glob.h -+++ libc/usr/src/head/glob.h +--- a/usr/src/head/glob.h ++++ b/usr/src/head/glob.h @@ -68,7 +68,7 @@ #ifndef _GLOB_H #define _GLOB_H @@ -134,10 +134,10 @@ Index: libc/usr/src/head/glob.h #include <sys/types.h> #include <sys/stat.h> #include <dirent.h> -Index: libc/usr/src/head/grp.h +Index: b/usr/src/head/grp.h =================================================================== ---- libc.orig/usr/src/head/grp.h -+++ libc/usr/src/head/grp.h +--- a/usr/src/head/grp.h ++++ b/usr/src/head/grp.h @@ -33,7 +33,7 @@ #ifndef _GRP_H #define _GRP_H @@ -147,10 +147,10 @@ Index: libc/usr/src/head/grp.h #include <sys/types.h> -Index: libc/usr/src/head/iconv.h +Index: b/usr/src/head/iconv.h =================================================================== ---- libc.orig/usr/src/head/iconv.h -+++ libc/usr/src/head/iconv.h +--- a/usr/src/head/iconv.h ++++ b/usr/src/head/iconv.h @@ -29,7 +29,7 @@ #ifndef _ICONV_H #define _ICONV_H @@ -160,10 +160,10 @@ Index: libc/usr/src/head/iconv.h #include <sys/types.h> #ifdef __cplusplus -Index: libc/usr/src/head/inttypes.h +Index: b/usr/src/head/inttypes.h =================================================================== ---- libc.orig/usr/src/head/inttypes.h -+++ libc/usr/src/head/inttypes.h +--- a/usr/src/head/inttypes.h ++++ b/usr/src/head/inttypes.h @@ -38,7 +38,7 @@ * SUSv3 Single Unix Specification, Version 3 */ @@ -173,10 +173,10 @@ Index: libc/usr/src/head/inttypes.h #include <sys/inttypes.h> #if (!defined(_XOPEN_SOURCE) || defined(_XPG6)) || defined(_STDC_C99) || \ -Index: libc/usr/src/head/iso/ctype_iso.h +Index: b/usr/src/head/iso/ctype_iso.h =================================================================== ---- libc.orig/usr/src/head/iso/ctype_iso.h -+++ libc/usr/src/head/iso/ctype_iso.h +--- a/usr/src/head/iso/ctype_iso.h ++++ b/usr/src/head/iso/ctype_iso.h @@ -44,7 +44,7 @@ #ifndef _ISO_CTYPE_ISO_H #define _ISO_CTYPE_ISO_H @@ -186,10 +186,10 @@ Index: libc/usr/src/head/iso/ctype_iso.h #ifdef __cplusplus extern "C" { -Index: libc/usr/src/head/iso/locale_iso.h +Index: b/usr/src/head/iso/locale_iso.h =================================================================== ---- libc.orig/usr/src/head/iso/locale_iso.h -+++ libc/usr/src/head/iso/locale_iso.h +--- a/usr/src/head/iso/locale_iso.h ++++ b/usr/src/head/iso/locale_iso.h @@ -45,7 +45,7 @@ #ifndef _ISO_LOCALE_ISO_H #define _ISO_LOCALE_ISO_H @@ -199,10 +199,10 @@ Index: libc/usr/src/head/iso/locale_iso.h #ifdef __cplusplus extern "C" { -Index: libc/usr/src/head/iso/setjmp_iso.h +Index: b/usr/src/head/iso/setjmp_iso.h =================================================================== ---- libc.orig/usr/src/head/iso/setjmp_iso.h -+++ libc/usr/src/head/iso/setjmp_iso.h +--- a/usr/src/head/iso/setjmp_iso.h ++++ b/usr/src/head/iso/setjmp_iso.h @@ -44,7 +44,7 @@ #ifndef _ISO_SETJMP_ISO_H #define _ISO_SETJMP_ISO_H @@ -212,10 +212,10 @@ Index: libc/usr/src/head/iso/setjmp_iso.h #ifdef __cplusplus extern "C" { -Index: libc/usr/src/head/iso/stdarg_c99.h +Index: b/usr/src/head/iso/stdarg_c99.h =================================================================== ---- libc.orig/usr/src/head/iso/stdarg_c99.h -+++ libc/usr/src/head/iso/stdarg_c99.h +--- a/usr/src/head/iso/stdarg_c99.h ++++ b/usr/src/head/iso/stdarg_c99.h @@ -49,7 +49,7 @@ * names into the users' namespace. */ @@ -225,10 +225,10 @@ Index: libc/usr/src/head/iso/stdarg_c99.h #ifdef __cplusplus extern "C" { -Index: libc/usr/src/head/iso/stdio_iso.h +Index: b/usr/src/head/iso/stdio_iso.h =================================================================== ---- libc.orig/usr/src/head/iso/stdio_iso.h -+++ libc/usr/src/head/iso/stdio_iso.h +--- a/usr/src/head/iso/stdio_iso.h ++++ b/usr/src/head/iso/stdio_iso.h @@ -48,7 +48,7 @@ #ifndef _ISO_STDIO_ISO_H #define _ISO_STDIO_ISO_H @@ -238,10 +238,10 @@ Index: libc/usr/src/head/iso/stdio_iso.h #include <sys/va_list.h> #include <stdio_tag.h> #include <stdio_impl.h> -Index: libc/usr/src/head/iso/stdlib_iso.h +Index: b/usr/src/head/iso/stdlib_iso.h =================================================================== ---- libc.orig/usr/src/head/iso/stdlib_iso.h -+++ libc/usr/src/head/iso/stdlib_iso.h +--- a/usr/src/head/iso/stdlib_iso.h ++++ b/usr/src/head/iso/stdlib_iso.h @@ -45,7 +45,7 @@ #ifndef _ISO_STDLIB_ISO_H #define _ISO_STDLIB_ISO_H @@ -251,10 +251,10 @@ Index: libc/usr/src/head/iso/stdlib_iso.h #ifdef __cplusplus extern "C" { -Index: libc/usr/src/head/iso/string_iso.h +Index: b/usr/src/head/iso/string_iso.h =================================================================== ---- libc.orig/usr/src/head/iso/string_iso.h -+++ libc/usr/src/head/iso/string_iso.h +--- a/usr/src/head/iso/string_iso.h ++++ b/usr/src/head/iso/string_iso.h @@ -45,7 +45,7 @@ #ifndef _ISO_STRING_ISO_H #define _ISO_STRING_ISO_H @@ -264,10 +264,10 @@ Index: libc/usr/src/head/iso/string_iso.h #ifdef __cplusplus extern "C" { -Index: libc/usr/src/head/iso/wctype_iso.h +Index: b/usr/src/head/iso/wctype_iso.h =================================================================== ---- libc.orig/usr/src/head/iso/wctype_iso.h -+++ libc/usr/src/head/iso/wctype_iso.h +--- a/usr/src/head/iso/wctype_iso.h ++++ b/usr/src/head/iso/wctype_iso.h @@ -45,7 +45,7 @@ #ifndef _ISO_WCTYPE_ISO_H #define _ISO_WCTYPE_ISO_H @@ -277,10 +277,10 @@ Index: libc/usr/src/head/iso/wctype_iso.h #ifdef __cplusplus extern "C" { -Index: libc/usr/src/head/langinfo.h +Index: b/usr/src/head/langinfo.h =================================================================== ---- libc.orig/usr/src/head/langinfo.h -+++ libc/usr/src/head/langinfo.h +--- a/usr/src/head/langinfo.h ++++ b/usr/src/head/langinfo.h @@ -33,7 +33,7 @@ #ifndef _LANGINFO_H #define _LANGINFO_H @@ -290,10 +290,10 @@ Index: libc/usr/src/head/langinfo.h #include <nl_types.h> #ifdef __cplusplus -Index: libc/usr/src/head/limits.h +Index: b/usr/src/head/limits.h =================================================================== ---- libc.orig/usr/src/head/limits.h -+++ libc/usr/src/head/limits.h +--- a/usr/src/head/limits.h ++++ b/usr/src/head/limits.h @@ -33,7 +33,7 @@ #ifndef _LIMITS_H #define _LIMITS_H @@ -303,10 +303,10 @@ Index: libc/usr/src/head/limits.h #include <sys/isa_defs.h> #include <iso/limits_iso.h> -Index: libc/usr/src/head/monetary.h +Index: b/usr/src/head/monetary.h =================================================================== ---- libc.orig/usr/src/head/monetary.h -+++ libc/usr/src/head/monetary.h +--- a/usr/src/head/monetary.h ++++ b/usr/src/head/monetary.h @@ -29,7 +29,7 @@ #ifndef _MONETARY_H #define _MONETARY_H @@ -316,10 +316,10 @@ Index: libc/usr/src/head/monetary.h #include <sys/types.h> #ifdef __cplusplus -Index: libc/usr/src/head/mqueue.h +Index: b/usr/src/head/mqueue.h =================================================================== ---- libc.orig/usr/src/head/mqueue.h -+++ libc/usr/src/head/mqueue.h +--- a/usr/src/head/mqueue.h ++++ b/usr/src/head/mqueue.h @@ -29,7 +29,7 @@ #ifndef _MQUEUE_H #define _MQUEUE_H @@ -329,10 +329,10 @@ Index: libc/usr/src/head/mqueue.h #include <sys/types.h> #include <sys/fcntl.h> #include <sys/signal.h> -Index: libc/usr/src/head/ndbm.h +Index: b/usr/src/head/ndbm.h =================================================================== ---- libc.orig/usr/src/head/ndbm.h -+++ libc/usr/src/head/ndbm.h +--- a/usr/src/head/ndbm.h ++++ b/usr/src/head/ndbm.h @@ -41,7 +41,7 @@ #ifndef _NDBM_H #define _NDBM_H @@ -342,10 +342,10 @@ Index: libc/usr/src/head/ndbm.h #include <sys/types.h> #ifdef __cplusplus -Index: libc/usr/src/head/netdb.h +Index: b/usr/src/head/netdb.h =================================================================== ---- libc.orig/usr/src/head/netdb.h -+++ libc/usr/src/head/netdb.h +--- a/usr/src/head/netdb.h ++++ b/usr/src/head/netdb.h @@ -78,7 +78,7 @@ #if !defined(_XPG4_2) || defined(_XPG6) || defined(__EXTENSIONS__) #include <sys/socket.h> @@ -355,10 +355,10 @@ Index: libc/usr/src/head/netdb.h #ifdef __cplusplus extern "C" { -Index: libc/usr/src/head/poll.h +Index: b/usr/src/head/poll.h =================================================================== ---- libc.orig/usr/src/head/poll.h -+++ libc/usr/src/head/poll.h +--- a/usr/src/head/poll.h ++++ b/usr/src/head/poll.h @@ -34,7 +34,7 @@ * Poll system call interface definitions. */ @@ -368,10 +368,10 @@ Index: libc/usr/src/head/poll.h #include <sys/poll.h> #if defined(__EXTENSIONS__) || !defined(__XOPEN_OR_POSIX) #include <time.h> -Index: libc/usr/src/head/pthread.h +Index: b/usr/src/head/pthread.h =================================================================== ---- libc.orig/usr/src/head/pthread.h -+++ libc/usr/src/head/pthread.h +--- a/usr/src/head/pthread.h ++++ b/usr/src/head/pthread.h @@ -29,7 +29,7 @@ #ifndef _PTHREAD_H #define _PTHREAD_H @@ -381,10 +381,10 @@ Index: libc/usr/src/head/pthread.h #ifndef _ASM #include <sys/types.h> -Index: libc/usr/src/head/pwd.h +Index: b/usr/src/head/pwd.h =================================================================== ---- libc.orig/usr/src/head/pwd.h -+++ libc/usr/src/head/pwd.h +--- a/usr/src/head/pwd.h ++++ b/usr/src/head/pwd.h @@ -33,7 +33,7 @@ #ifndef _PWD_H #define _PWD_H @@ -394,10 +394,10 @@ Index: libc/usr/src/head/pwd.h #include <sys/types.h> -Index: libc/usr/src/head/re_comp.h +Index: b/usr/src/head/re_comp.h =================================================================== ---- libc.orig/usr/src/head/re_comp.h -+++ libc/usr/src/head/re_comp.h +--- a/usr/src/head/re_comp.h ++++ b/usr/src/head/re_comp.h @@ -29,7 +29,7 @@ #ifndef _RE_COMP_H #define _RE_COMP_H @@ -407,10 +407,10 @@ Index: libc/usr/src/head/re_comp.h #ifdef __cplusplus extern "C" { -Index: libc/usr/src/head/regex.h +Index: b/usr/src/head/regex.h =================================================================== ---- libc.orig/usr/src/head/regex.h -+++ libc/usr/src/head/regex.h +--- a/usr/src/head/regex.h ++++ b/usr/src/head/regex.h @@ -38,7 +38,7 @@ #ifndef _REGEX_H #define _REGEX_H @@ -420,10 +420,10 @@ Index: libc/usr/src/head/regex.h #include <sys/types.h> #ifdef __cplusplus -Index: libc/usr/src/head/semaphore.h +Index: b/usr/src/head/semaphore.h =================================================================== ---- libc.orig/usr/src/head/semaphore.h -+++ libc/usr/src/head/semaphore.h +--- a/usr/src/head/semaphore.h ++++ b/usr/src/head/semaphore.h @@ -29,7 +29,7 @@ #ifndef _SEMAPHORE_H #define _SEMAPHORE_H @@ -433,10 +433,10 @@ Index: libc/usr/src/head/semaphore.h #include <sys/types.h> #include <sys/fcntl.h> -Index: libc/usr/src/head/spawn.h +Index: b/usr/src/head/spawn.h =================================================================== ---- libc.orig/usr/src/head/spawn.h -+++ libc/usr/src/head/spawn.h +--- a/usr/src/head/spawn.h ++++ b/usr/src/head/spawn.h @@ -33,7 +33,7 @@ #ifndef _SPAWN_H #define _SPAWN_H @@ -446,10 +446,10 @@ Index: libc/usr/src/head/spawn.h #include <sys/types.h> #include <signal.h> #include <sched.h> -Index: libc/usr/src/head/strings.h +Index: b/usr/src/head/strings.h =================================================================== ---- libc.orig/usr/src/head/strings.h -+++ libc/usr/src/head/strings.h +--- a/usr/src/head/strings.h ++++ b/usr/src/head/strings.h @@ -30,7 +30,7 @@ #define _STRINGS_H @@ -459,10 +459,10 @@ Index: libc/usr/src/head/strings.h #if !defined(_XOPEN_SOURCE) || defined(__EXTENSIONS__) #include <string.h> -Index: libc/usr/src/head/stropts.h +Index: b/usr/src/head/stropts.h =================================================================== ---- libc.orig/usr/src/head/stropts.h -+++ libc/usr/src/head/stropts.h +--- a/usr/src/head/stropts.h ++++ b/usr/src/head/stropts.h @@ -36,7 +36,7 @@ * Streams user options definitions. */ @@ -472,10 +472,10 @@ Index: libc/usr/src/head/stropts.h #include <sys/stropts.h> #ifdef __cplusplus -Index: libc/usr/src/head/tar.h +Index: b/usr/src/head/tar.h =================================================================== ---- libc.orig/usr/src/head/tar.h -+++ libc/usr/src/head/tar.h +--- a/usr/src/head/tar.h ++++ b/usr/src/head/tar.h @@ -34,7 +34,7 @@ extern "C" { #endif @@ -485,10 +485,10 @@ Index: libc/usr/src/head/tar.h #define TMAGIC "ustar" #define TMAGLEN 6 -Index: libc/usr/src/head/utmpx.h +Index: b/usr/src/head/utmpx.h =================================================================== ---- libc.orig/usr/src/head/utmpx.h -+++ libc/usr/src/head/utmpx.h +--- a/usr/src/head/utmpx.h ++++ b/usr/src/head/utmpx.h @@ -37,7 +37,7 @@ #ifndef _UTMPX_H #define _UTMPX_H @@ -498,10 +498,10 @@ Index: libc/usr/src/head/utmpx.h #include <sys/types.h> #include <sys/time.h> #include <utmp.h> -Index: libc/usr/src/head/varargs.h +Index: b/usr/src/head/varargs.h =================================================================== ---- libc.orig/usr/src/head/varargs.h -+++ libc/usr/src/head/varargs.h +--- a/usr/src/head/varargs.h ++++ b/usr/src/head/varargs.h @@ -44,7 +44,7 @@ * names into the users' namespace. */ @@ -511,10 +511,10 @@ Index: libc/usr/src/head/varargs.h #include <sys/va_impl.h> #ifdef __cplusplus -Index: libc/usr/src/head/wchar.h +Index: b/usr/src/head/wchar.h =================================================================== ---- libc.orig/usr/src/head/wchar.h -+++ libc/usr/src/head/wchar.h +--- a/usr/src/head/wchar.h ++++ b/usr/src/head/wchar.h @@ -27,7 +27,7 @@ #ifndef _WCHAR_H #define _WCHAR_H @@ -524,10 +524,10 @@ Index: libc/usr/src/head/wchar.h #include <iso/wchar_iso.h> #include <iso/wchar_c99.h> -Index: libc/usr/src/head/widec.h +Index: b/usr/src/head/widec.h =================================================================== ---- libc.orig/usr/src/head/widec.h -+++ libc/usr/src/head/widec.h +--- a/usr/src/head/widec.h ++++ b/usr/src/head/widec.h @@ -35,7 +35,7 @@ #ifndef _WIDEC_H #define _WIDEC_H @@ -537,10 +537,10 @@ Index: libc/usr/src/head/widec.h #include <stdio.h> /* For definition of FILE */ #include <euc.h> -Index: libc/usr/src/head/wordexp.h +Index: b/usr/src/head/wordexp.h =================================================================== ---- libc.orig/usr/src/head/wordexp.h -+++ libc/usr/src/head/wordexp.h +--- a/usr/src/head/wordexp.h ++++ b/usr/src/head/wordexp.h @@ -33,7 +33,7 @@ #ifndef _WORDEXP_H #define _WORDEXP_H @@ -550,10 +550,10 @@ Index: libc/usr/src/head/wordexp.h #include <sys/types.h> #ifdef __cplusplus -Index: libc/usr/src/head/iso/wchar_iso.h +Index: b/usr/src/head/iso/wchar_iso.h =================================================================== ---- libc.orig/usr/src/head/iso/wchar_iso.h -+++ libc/usr/src/head/iso/wchar_iso.h +--- a/usr/src/head/iso/wchar_iso.h ++++ b/usr/src/head/iso/wchar_iso.h @@ -41,7 +41,7 @@ #ifndef _ISO_WCHAR_ISO_H #define _ISO_WCHAR_ISO_H diff --git a/libc/debian/patches/fnmatch-FNM_CASEFOLD.patch b/libc/debian/patches/fnmatch-FNM_CASEFOLD.patch index de511f9..60740fb 100644 --- a/libc/debian/patches/fnmatch-FNM_CASEFOLD.patch +++ b/libc/debian/patches/fnmatch-FNM_CASEFOLD.patch @@ -1,8 +1,8 @@ Index: b/usr/src/head/fnmatch.h =================================================================== ---- 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 @@ +--- a/usr/src/head/fnmatch.h ++++ b/usr/src/head/fnmatch.h +@@ -37,6 +37,7 @@ extern "C" { #define FNM_PERIOD 0x04 /* Leading period in string must be exactly */ /* matched by period in pattern */ #define FNM_IGNORECASE 0x08 /* Ignore case when making comparisons */ diff --git a/libc/debian/patches/fork1.patch b/libc/debian/patches/fork1.patch index 4441793..462f96b 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 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 @@ +--- a/usr/src/lib/libc/port/threads/scalls.c ++++ b/usr/src/lib/libc/port/threads/scalls.c +@@ -82,7 +82,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 6262e76..975378c 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 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 +--- a/usr/src/lib/libc/i386/inc/SYS.h ++++ b/usr/src/lib/libc/i386/inc/SYS.h @@ -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 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 +--- a/usr/src/lib/libc/amd64/inc/SYS.h ++++ b/usr/src/lib/libc/amd64/inc/SYS.h @@ -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 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 +--- a/usr/src/lib/libc/amd64/gen/memcmp.s ++++ b/usr/src/lib/libc/amd64/gen/memcmp.s @@ -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 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 +--- a/usr/src/lib/libc/amd64/gen/memcpy.s ++++ b/usr/src/lib/libc/amd64/gen/memcpy.s @@ -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 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 +--- a/usr/src/lib/libc/amd64/gen/memset.s ++++ b/usr/src/lib/libc/amd64/gen/memset.s @@ -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 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 +--- a/usr/src/lib/libc/amd64/gen/strcmp.s ++++ b/usr/src/lib/libc/amd64/gen/strcmp.s @@ -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 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 +--- a/usr/src/lib/libc/amd64/gen/strcpy.s ++++ b/usr/src/lib/libc/amd64/gen/strcpy.s @@ -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 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 +--- a/usr/src/lib/libc/amd64/gen/strlen.s ++++ b/usr/src/lib/libc/amd64/gen/strlen.s @@ -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 5f6da3d..27266e2 100644 --- a/libc/debian/patches/genassym-use-gnuld.patch +++ b/libc/debian/patches/genassym-use-gnuld.patch @@ -2,9 +2,9 @@ Description: illumos ld (sunld) complains about R_AMD64_GOT32 in crt1.o: section [2].rela.text: relocation not currently supported Index: b/usr/src/lib/libc/amd64/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/amd64/Makefile ++++ b/usr/src/lib/libc/amd64/Makefile +@@ -1237,7 +1237,7 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h GENASSYM_C = genassym.c genassym: $(GENASSYM_C) @@ -15,9 +15,9 @@ Index: b/usr/src/lib/libc/amd64/Makefile OFFSETS = $(LIBCDIR)/$(MACH)/offsets.in Index: b/usr/src/lib/libc/i386/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/i386/Makefile.com ++++ b/usr/src/lib/libc/i386/Makefile.com +@@ -1311,7 +1311,7 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h 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 2ccfd95..32ddfd8 100644 --- a/libc/debian/patches/getconf-no-xpg.patch +++ b/libc/debian/patches/getconf-no-xpg.patch @@ -1,8 +1,8 @@ Index: b/usr/src/cmd/getconf/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/cmd/getconf/Makefile ++++ b/usr/src/cmd/getconf/Makefile +@@ -72,7 +72,7 @@ $(XPG6) := CFLAGS += -D_XOPEN_SOURCE=600 .KEEP_STATE: @@ -11,7 +11,7 @@ Index: b/usr/src/cmd/getconf/Makefile $(PROG): $(OBJS) $(LINK.c) -o $@ $(OBJS) $(LDLIBS) -@@ -110,7 +110,7 @@ +@@ -109,7 +109,7 @@ $(X6): -@mkdir -p $@ diff --git a/libc/debian/patches/getent-avoid-libproject.patch b/libc/debian/patches/getent-avoid-libproject.patch index ef0ea64..f970b1d 100644 --- a/libc/debian/patches/getent-avoid-libproject.patch +++ b/libc/debian/patches/getent-avoid-libproject.patch @@ -1,8 +1,8 @@ Index: b/usr/src/cmd/getent/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/cmd/getent/Makefile ++++ b/usr/src/cmd/getent/Makefile +@@ -48,7 +48,7 @@ OBJECTS= \ 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 2014-03-02 23:20:17.699466732 +0400 -+++ b/usr/src/cmd/getent/dogetproject.c 2014-03-02 23:22:01.565908668 +0400 +--- a/usr/src/cmd/getent/dogetproject.c ++++ b/usr/src/cmd/getent/dogetproject.c @@ -29,9 +29,226 @@ #include <stdio.h> #include <grp.h> diff --git a/libc/debian/patches/gnu-basename.patch b/libc/debian/patches/gnu-basename.patch index 29ff0fb..291925e 100644 --- a/libc/debian/patches/gnu-basename.patch +++ b/libc/debian/patches/gnu-basename.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/head/libgen.h +Index: b/usr/src/head/libgen.h =================================================================== ---- libc.orig/usr/src/head/libgen.h -+++ libc/usr/src/head/libgen.h +--- a/usr/src/head/libgen.h ++++ b/usr/src/head/libgen.h @@ -37,7 +37,7 @@ #ifndef _LIBGEN_H #define _LIBGEN_H @@ -22,10 +22,10 @@ Index: libc/usr/src/head/libgen.h extern char *dirname(char *); #if !defined(_XPG6) || defined(__EXTENSIONS__) -Index: libc/usr/src/head/string.h +Index: b/usr/src/head/string.h =================================================================== ---- libc.orig/usr/src/head/string.h -+++ libc/usr/src/head/string.h +--- a/usr/src/head/string.h ++++ b/usr/src/head/string.h @@ -150,6 +150,10 @@ extern char *strdup(const char *); extern void *mempcpy(void *, const void *, size_t); extern void *memrchr(const void *, int, size_t); diff --git a/libc/debian/patches/gnu-make-quirks.patch b/libc/debian/patches/gnu-make-quirks.patch index a019b87..1c6b0e4 100644 --- a/libc/debian/patches/gnu-make-quirks.patch +++ b/libc/debian/patches/gnu-make-quirks.patch @@ -4,10 +4,10 @@ Description: Fixes for GNU make. others may need support from GNU make, for example: http://savannah.gnu.org/bugs/?37237 -Index: libc/usr/src/lib/libc/Makefile.targ +Index: b/usr/src/lib/libc/Makefile.targ =================================================================== ---- libc.orig/usr/src/lib/libc/Makefile.targ -+++ libc/usr/src/lib/libc/Makefile.targ +--- a/usr/src/lib/libc/Makefile.targ ++++ b/usr/src/lib/libc/Makefile.targ @@ -53,10 +53,6 @@ pics/%.o: $(LIBCBASE)/../$(TARGET_ARCH)/ $(BUILD.s) $(POST_PROCESS_O) @@ -48,10 +48,10 @@ Index: libc/usr/src/lib/libc/Makefile.targ $(COMPILE.c) -I$(SRC)/common/crypto/chacha -DKEYSTREAM_ONLY \ -o $@ $(SRC)/common/crypto/chacha/$(@F:.o=.c) $(POST_PROCESS_O) -Index: libc/usr/src/Makefile.msg.targ +Index: b/usr/src/Makefile.msg.targ =================================================================== ---- libc.orig/usr/src/Makefile.msg.targ -+++ libc/usr/src/Makefile.msg.targ +--- a/usr/src/Makefile.msg.targ ++++ b/usr/src/Makefile.msg.targ @@ -33,7 +33,7 @@ .PARALLEL: $(POFILES) $(MSGFILES) @@ -61,10 +61,10 @@ Index: libc/usr/src/Makefile.msg.targ $(INS.dir) $(MSGDOMAINPOFILE): $(MSGDOMAIN) $(POFILE) -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 -+++ libc/usr/src/lib/libc/i386/Makefile.com +--- a/usr/src/lib/libc/i386/Makefile.com ++++ b/usr/src/lib/libc/i386/Makefile.com @@ -1314,5 +1314,9 @@ $(LIBCDIR)/port/gen/new_list.c: $(LIBCDI cd $(LIBCDIR)/port/gen; pwd; $(AWK) -f errlist.awk < errlist @@ -75,10 +75,10 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com pics/new_list.o: $(LIBCDIR)/port/gen/new_list.c + $(COMPILE.c) -o $@ $< + $(POST_PROCESS_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 -+++ libc/usr/src/lib/libc/amd64/Makefile +--- a/usr/src/lib/libc/amd64/Makefile ++++ b/usr/src/lib/libc/amd64/Makefile @@ -1240,5 +1240,9 @@ $(LIBCDIR)/port/gen/new_list.c: $(LIBCDI cd $(LIBCDIR)/port/gen; pwd; $(AWK) -f errlist.awk < errlist diff --git a/libc/debian/patches/head-make-secondary.patch b/libc/debian/patches/head-make-secondary.patch index a8a4079..554c299 100644 --- a/libc/debian/patches/head-make-secondary.patch +++ b/libc/debian/patches/head-make-secondary.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/head/Makefile +Index: b/usr/src/head/Makefile =================================================================== ---- libc.orig/usr/src/head/Makefile -+++ libc/usr/src/head/Makefile +--- a/usr/src/head/Makefile ++++ b/usr/src/head/Makefile @@ -31,6 +31,9 @@ # include global definitions include ../Makefile.master diff --git a/libc/debian/patches/headers-limits.h-name-max.patch b/libc/debian/patches/headers-limits.h-name-max.patch index 55c7022..b3f1d01 100644 --- a/libc/debian/patches/headers-limits.h-name-max.patch +++ b/libc/debian/patches/headers-limits.h-name-max.patch @@ -1,8 +1,8 @@ Index: b/usr/src/head/limits.h =================================================================== ---- 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 @@ +--- a/usr/src/head/limits.h ++++ b/usr/src/head/limits.h +@@ -262,6 +262,8 @@ extern "C" { * #define NAME_MAX 14 */ diff --git a/libc/debian/patches/i386-regset.patch b/libc/debian/patches/i386-regset.patch index 2b549de..f71e971 100644 --- a/libc/debian/patches/i386-regset.patch +++ b/libc/debian/patches/i386-regset.patch @@ -1,9 +1,9 @@ Description: get register names from /usr/include/sys/regset.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 -+++ libc/usr/src/lib/libc/i386/Makefile.com -@@ -1062,7 +1062,7 @@ MAPFILES = $(LIBCDIR)/port/mapfile-vers. +--- a/usr/src/lib/libc/i386/Makefile.com ++++ b/usr/src/lib/libc/i386/Makefile.com +@@ -1080,7 +1080,7 @@ MAPFILES = $(LIBCDIR)/port/mapfile-vers. # EXTN_CPPFLAGS and EXTN_CFLAGS set in enclosing Makefile # CFLAGS += $(EXTN_CFLAGS) @@ -12,7 +12,7 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc $(CPPFLAGS.master) ASFLAGS= $(AS_PICFLAGS) -P -D__STDC__ -D_ASM $(CPPFLAGS) $(i386_AS_XARCH) -@@ -1292,7 +1292,7 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h +@@ -1312,7 +1312,7 @@ $(ASSYMDEP_OBJS:%=pics/%): assym.h GENASSYM_C = $(LIBCDIR)/$(MACH)/genassym.c genassym: $(GENASSYM_C) diff --git a/libc/debian/patches/illumos-2252-gettext.patch b/libc/debian/patches/illumos-2252-gettext.patch index b1934a6..6ca3f9c 100644 --- a/libc/debian/patches/illumos-2252-gettext.patch +++ b/libc/debian/patches/illumos-2252-gettext.patch @@ -4,18 +4,18 @@ 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 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; +--- a/usr/src/lib/libc/port/i18n/gettext_util.c ++++ b/usr/src/lib/libc/port/i18n/gettext_util.c +@@ -87,6 +87,8 @@ mk_msgfile(struct msg_pack *mp) + const char *q; + char *p; const char *catstr; + char *country; + char *charset; uint32_t cblen, loclen, catlen, totallen; #ifdef GETTEXT_DEBUG -@@ -127,9 +129,39 @@ +@@ -126,9 +128,39 @@ mk_msgfile(struct msg_pack *mp) return (NULL); q = mp->locale; diff --git a/libc/debian/patches/illumos-2404-mmap.patch b/libc/debian/patches/illumos-2404-mmap.patch index 4e35323..0ab2b3a 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 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 +--- a/usr/src/lib/libc/common/sys/mmap.s ++++ b/usr/src/lib/libc/common/sys/mmap.s @@ -31,17 +31,11 @@ #include <sys/asm_linkage.h> @@ -52,8 +52,8 @@ Index: b/usr/src/lib/libc/common/sys/mmap.s -#endif 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 2014-03-02 23:20:59.383765203 +0400 +--- /dev/null ++++ b/usr/src/lib/libc/common/sys/mmap64.s @@ -0,0 +1,56 @@ +/* + * CDDL HEADER START @@ -113,9 +113,9 @@ 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 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 @@ +--- a/usr/src/lib/libc/Makefile.targ ++++ b/usr/src/lib/libc/Makefile.targ +@@ -103,6 +103,10 @@ pics/%.o: $(LIBCBASE)/../$(TARGET_ARCH)/ # rules to build large file aware objects (xxx64.o from xxx.s or xxx.c) diff --git a/libc/debian/patches/illumos-3253-tsol-workaround.patch b/libc/debian/patches/illumos-3253-tsol-workaround.patch index fdca7f7..6f514d6 100644 --- a/libc/debian/patches/illumos-3253-tsol-workaround.patch +++ b/libc/debian/patches/illumos-3253-tsol-workaround.patch @@ -2,8 +2,8 @@ Description: <tsol/label.h> is not actually needed Bug: https://www.illumos.org/issues/3253 Index: b/usr/src/lib/libc/port/gen/ucred.c =================================================================== ---- 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 +--- a/usr/src/lib/libc/port/gen/ucred.c ++++ b/usr/src/lib/libc/port/gen/ucred.c @@ -66,7 +66,10 @@ #include <sys/procfs.h> #include <sys/sysmacros.h> @@ -18,8 +18,8 @@ Index: b/usr/src/lib/libc/port/gen/ucred.c _ucred_alloc(void) Index: b/usr/src/head/zone.h =================================================================== ---- 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 +--- a/usr/src/head/zone.h ++++ b/usr/src/head/zone.h @@ -29,7 +29,7 @@ #include <sys/types.h> #include <sys/zone.h> @@ -31,8 +31,8 @@ Index: b/usr/src/head/zone.h extern "C" { Index: b/usr/src/lib/libnsl/rpc/svc_generic.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/rpc/svc_generic.c ++++ b/usr/src/lib/libnsl/rpc/svc_generic.c @@ -49,7 +49,7 @@ #include <malloc.h> #include <string.h> @@ -44,8 +44,8 @@ Index: b/usr/src/lib/libnsl/rpc/svc_generic.c #include <rpcsvc/mount.h> Index: b/usr/src/lib/libnsl/rpc/ti_opts.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/rpc/ti_opts.c ++++ b/usr/src/lib/libnsl/rpc/ti_opts.c @@ -58,7 +58,7 @@ #include <alloca.h> #include <stdlib.h> diff --git a/libc/debian/patches/libc-NULL-undeclared.patch b/libc/debian/patches/libc-NULL-undeclared.patch index 39f05f9..cf22b9a 100644 --- a/libc/debian/patches/libc-NULL-undeclared.patch +++ b/libc/debian/patches/libc-NULL-undeclared.patch @@ -1,7 +1,7 @@ Index: b/usr/src/lib/libc/port/fp/ieee_globals.c =================================================================== ---- 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 +--- a/usr/src/lib/libc/port/fp/ieee_globals.c ++++ b/usr/src/lib/libc/port/fp/ieee_globals.c @@ -41,6 +41,7 @@ */ @@ -12,8 +12,8 @@ Index: b/usr/src/lib/libc/port/fp/ieee_globals.c #include <mtlib.h> Index: b/usr/src/lib/libc/port/gen/catgets.c =================================================================== ---- 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 +--- a/usr/src/lib/libc/port/gen/catgets.c ++++ b/usr/src/lib/libc/port/gen/catgets.c @@ -33,6 +33,7 @@ #pragma weak _catgets = catgets @@ -24,8 +24,8 @@ Index: b/usr/src/lib/libc/port/gen/catgets.c #include <errno.h> Index: b/usr/src/lib/libc/port/gen/tfind.c =================================================================== ---- 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 +--- a/usr/src/lib/libc/port/gen/tfind.c ++++ b/usr/src/lib/libc/port/gen/tfind.c @@ -39,6 +39,7 @@ #pragma weak _tfind = tfind @@ -36,8 +36,8 @@ Index: b/usr/src/lib/libc/port/gen/tfind.c #include <search.h> Index: b/usr/src/lib/libc/port/sys/exacctsys.c =================================================================== ---- 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 +--- a/usr/src/lib/libc/port/sys/exacctsys.c ++++ b/usr/src/lib/libc/port/sys/exacctsys.c @@ -31,6 +31,7 @@ #pragma weak _wracct = wracct @@ -48,8 +48,8 @@ Index: b/usr/src/lib/libc/port/sys/exacctsys.c #include <sys/procset.h> Index: b/usr/src/lib/libc/port/sys/rctlsys.c =================================================================== ---- 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 +--- a/usr/src/lib/libc/port/sys/rctlsys.c ++++ b/usr/src/lib/libc/port/sys/rctlsys.c @@ -30,6 +30,7 @@ #pragma weak _setrctl = setrctl @@ -60,8 +60,8 @@ Index: b/usr/src/lib/libc/port/sys/rctlsys.c #include <sys/rctl.h> Index: b/usr/src/lib/libc/port/sys/sidsys.c =================================================================== ---- 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 +--- a/usr/src/lib/libc/port/sys/sidsys.c ++++ b/usr/src/lib/libc/port/sys/sidsys.c @@ -29,6 +29,7 @@ */ @@ -72,8 +72,8 @@ Index: b/usr/src/lib/libc/port/sys/sidsys.c Index: b/usr/src/common/unicode/uconv.c =================================================================== ---- 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 +--- a/usr/src/common/unicode/uconv.c ++++ b/usr/src/common/unicode/uconv.c @@ -34,6 +34,7 @@ * Interface stability: Committed */ diff --git a/libc/debian/patches/libc-accept.patch b/libc/debian/patches/libc-accept.patch index 2d28208..7aae107 100644 --- a/libc/debian/patches/libc-accept.patch +++ b/libc/debian/patches/libc-accept.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/lib/libc/common/sys/_so_accept.s +Index: b/usr/src/lib/libc/common/sys/_so_accept.s =================================================================== ---- libc.orig/usr/src/lib/libc/common/sys/_so_accept.s 2014-03-01 16:18:11.000000000 +0400 -+++ libc/usr/src/lib/libc/common/sys/_so_accept.s 2014-04-03 15:11:34.941679423 +0400 +--- a/usr/src/lib/libc/common/sys/_so_accept.s ++++ b/usr/src/lib/libc/common/sys/_so_accept.s @@ -33,8 +33,8 @@ /* C library -- __so_accept */ @@ -21,11 +21,11 @@ Index: libc/usr/src/lib/libc/common/sys/_so_accept.s + SYSCALL2_RVAL1(__so_accept4,accept4) + RET + SET_SIZE(__so_accept4) -Index: libc/usr/src/lib/libc/port/threads/scalls.c +Index: b/usr/src/lib/libc/port/threads/scalls.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/threads/scalls.c 2014-04-03 10:50:29.980299122 +0400 -+++ libc/usr/src/lib/libc/port/threads/scalls.c 2014-04-03 15:12:54.000556865 +0400 -@@ -1024,13 +1024,22 @@ +--- a/usr/src/lib/libc/port/threads/scalls.c ++++ b/usr/src/lib/libc/port/threads/scalls.c +@@ -1067,13 +1067,22 @@ sigqueue(pid_t pid, int signo, const uni } int @@ -51,10 +51,10 @@ Index: libc/usr/src/lib/libc/port/threads/scalls.c } int -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 2014-04-03 10:50:46.271670133 +0400 -+++ libc/usr/src/lib/libsocket/socket/weaks.c 2014-04-03 15:25:55.056118010 +0400 +--- a/usr/src/lib/libsocket/socket/weaks.c ++++ b/usr/src/lib/libsocket/socket/weaks.c @@ -61,6 +61,7 @@ extern int _so_bind(); extern int _so_listen(); @@ -63,7 +63,7 @@ Index: libc/usr/src/lib/libsocket/socket/weaks.c extern int _so_connect(); extern int _so_shutdown(); extern int _so_recv(); -@@ -93,13 +94,13 @@ +@@ -93,13 +94,13 @@ _listen(int sock, int backlog) int _accept(int sock, struct sockaddr *addr, int *addrlen) { @@ -79,11 +79,11 @@ Index: libc/usr/src/lib/libsocket/socket/weaks.c } int -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-04-03 10:50:48.920489683 +0400 -+++ libc/usr/src/lib/libc/port/mapfile-vers 2014-04-03 15:29:38.052488239 +0400 -@@ -120,6 +120,7 @@ +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers +@@ -262,6 +262,7 @@ SYMBOL_VERSION ILLUMOS_0.4 { # Illumos a SYMBOL_VERSION DYSON_1 { global: diff --git a/libc/debian/patches/libc-add-cfmakeraw.patch b/libc/debian/patches/libc-add-cfmakeraw.patch index f335acf..b070b13 100644 --- a/libc/debian/patches/libc-add-cfmakeraw.patch +++ b/libc/debian/patches/libc-add-cfmakeraw.patch @@ -1,7 +1,7 @@ Index: b/usr/src/head/termios.h =================================================================== ---- 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 +--- a/usr/src/head/termios.h ++++ b/usr/src/head/termios.h @@ -28,6 +28,16 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.2 */ @@ -21,8 +21,8 @@ Index: b/usr/src/head/termios.h #endif /* _TERMIOS_H */ Index: b/usr/src/lib/libc/port/gen/cfmakeraw.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/usr/src/lib/libc/port/gen/cfmakeraw.c 2014-03-02 23:24:22.267187476 +0400 +--- /dev/null ++++ b/usr/src/lib/libc/port/gen/cfmakeraw.c @@ -0,0 +1,19 @@ +/* + * Public Domain. @@ -45,9 +45,9 @@ Index: b/usr/src/lib/libc/port/gen/cfmakeraw.c +} Index: b/usr/src/lib/libc/amd64/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/amd64/Makefile ++++ b/usr/src/lib/libc/amd64/Makefile +@@ -359,6 +359,7 @@ PORTGEN= \ catopen.o \ cfgetispeed.o \ cfgetospeed.o \ @@ -57,9 +57,9 @@ Index: b/usr/src/lib/libc/amd64/Makefile cfsetospeed.o \ Index: b/usr/src/lib/libc/i386/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/i386/Makefile.com ++++ b/usr/src/lib/libc/i386/Makefile.com +@@ -391,6 +391,7 @@ PORTGEN= \ catopen.o \ cfgetispeed.o \ cfgetospeed.o \ @@ -69,9 +69,9 @@ Index: b/usr/src/lib/libc/i386/Makefile.com cfsetospeed.o \ Index: b/usr/src/lib/libc/port/mapfile-vers =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers +@@ -269,6 +269,7 @@ $endif SYMBOL_VERSION DYSON_1 { global: diff --git a/libc/debian/patches/libc-add-flock.patch b/libc/debian/patches/libc-add-flock.patch index 6be8510..9260f17 100644 --- a/libc/debian/patches/libc-add-flock.patch +++ b/libc/debian/patches/libc-add-flock.patch @@ -1,7 +1,7 @@ Index: b/usr/src/lib/libc/port/sys/flock.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/usr/src/lib/libc/port/sys/flock.c 2014-03-02 23:23:28.525201461 +0400 +--- /dev/null ++++ b/usr/src/lib/libc/port/sys/flock.c @@ -0,0 +1,82 @@ +/* + * CDDL HEADER START @@ -87,9 +87,9 @@ Index: b/usr/src/lib/libc/port/sys/flock.c +} Index: b/usr/src/lib/libc/amd64/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/amd64/Makefile ++++ b/usr/src/lib/libc/amd64/Makefile +@@ -193,6 +193,7 @@ COMSYSOBJS= \ fchdir.o \ fchroot.o \ fdsync.o \ @@ -99,9 +99,9 @@ Index: b/usr/src/lib/libc/amd64/Makefile fstatvfs.o \ Index: b/usr/src/lib/libc/i386/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/i386/Makefile.com ++++ b/usr/src/lib/libc/i386/Makefile.com +@@ -217,6 +217,7 @@ COMSYSOBJS= \ fchdir.o \ fchroot.o \ fdsync.o \ @@ -111,9 +111,9 @@ Index: b/usr/src/lib/libc/i386/Makefile.com fstatvfs.o \ Index: b/usr/src/lib/libc/port/mapfile-vers =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers +@@ -274,6 +274,7 @@ SYMBOL_VERSION DYSON_1 { 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 e4703e9..0395481 100644 --- a/libc/debian/patches/libc-add-fts.patch +++ b/libc/debian/patches/libc-add-fts.patch @@ -2,9 +2,9 @@ Description: implement fts_* functions, taken from FreeBSD, heavily patched for illumos Index: b/usr/src/lib/libc/amd64/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/amd64/Makefile ++++ b/usr/src/lib/libc/amd64/Makefile +@@ -392,6 +392,7 @@ PORTGEN= \ fmtmsg.o \ ftime.o \ ftok.o \ @@ -14,9 +14,9 @@ Index: b/usr/src/lib/libc/amd64/Makefile getauxv.o \ Index: b/usr/src/lib/libc/i386/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/i386/Makefile.com ++++ b/usr/src/lib/libc/i386/Makefile.com +@@ -425,6 +425,7 @@ PORTGEN= \ fmtmsg.o \ ftime.o \ ftok.o \ @@ -26,8 +26,8 @@ Index: b/usr/src/lib/libc/i386/Makefile.com getauxv.o \ Index: b/usr/src/lib/libc/port/gen/fts.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/usr/src/lib/libc/port/gen/fts.c 2014-03-02 23:24:01.569528242 +0400 +--- /dev/null ++++ b/usr/src/lib/libc/port/gen/fts.c @@ -0,0 +1,1190 @@ +/*- + * Copyright (c) 1990, 1993, 1994 @@ -1221,8 +1221,8 @@ Index: b/usr/src/lib/libc/port/gen/fts.c +} Index: b/usr/src/head/fts.h =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/usr/src/head/fts.h 2014-03-02 23:24:01.571108080 +0400 +--- /dev/null ++++ b/usr/src/head/fts.h @@ -0,0 +1,135 @@ +/* + * Copyright (c) 1989, 1993 @@ -1361,10 +1361,10 @@ Index: b/usr/src/head/fts.h +#endif /* !_FTS_H_ */ Index: b/usr/src/head/Makefile =================================================================== ---- 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 \ +--- a/usr/src/head/Makefile ++++ b/usr/src/head/Makefile +@@ -79,6 +79,7 @@ HDRS= $($(MACH)_HDRS) $(ATTRDB_HDRS) + floatingpoint.h \ fmtmsg.h \ fnmatch.h \ + fts.h \ @@ -1373,9 +1373,9 @@ Index: b/usr/src/head/Makefile getopt.h \ Index: b/usr/src/lib/libc/port/mapfile-vers =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers +@@ -275,6 +275,11 @@ SYMBOL_VERSION DYSON_1 { 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 fad82db..db52ebe 100644 --- a/libc/debian/patches/libc-add-get_current_dir_name.patch +++ b/libc/debian/patches/libc-add-get_current_dir_name.patch @@ -3,9 +3,9 @@ Description: add get_current_dir_name() - the GNU extension and it gets some functions multiple defined (e. g. malloc, read) Index: b/usr/src/head/unistd.h =================================================================== ---- 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 @@ +--- a/usr/src/head/unistd.h ++++ b/usr/src/head/unistd.h +@@ -335,6 +335,9 @@ extern int fsync(int); extern int ftruncate(int, off_t); #endif /* !defined(__XOPEN_OR_POSIX) || (_POSIX_C_SOURCE > 2)... */ extern char *getcwd(char *, size_t); @@ -17,9 +17,9 @@ Index: b/usr/src/head/unistd.h extern int getdtablesize(void); Index: b/usr/src/lib/libc/port/mapfile-vers =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers +@@ -280,6 +280,7 @@ SYMBOL_VERSION DYSON_1 { fts_open; fts_read; fts_set; @@ -29,8 +29,8 @@ Index: b/usr/src/lib/libc/port/mapfile-vers mempcpy; Index: b/usr/src/lib/libc/port/gen/get_current_dir_name.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/usr/src/lib/libc/port/gen/get_current_dir_name.c 2014-03-02 23:24:19.251471523 +0400 +--- /dev/null ++++ b/usr/src/lib/libc/port/gen/get_current_dir_name.c @@ -0,0 +1,39 @@ + +/* @@ -73,9 +73,9 @@ Index: b/usr/src/lib/libc/port/gen/get_current_dir_name.c +} Index: b/usr/src/lib/libc/i386/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/i386/Makefile.com ++++ b/usr/src/lib/libc/i386/Makefile.com +@@ -428,6 +428,7 @@ PORTGEN= \ fts.o \ ftw.o \ gcvt.o \ @@ -85,9 +85,9 @@ Index: b/usr/src/lib/libc/i386/Makefile.com getdate_err.o \ Index: b/usr/src/lib/libc/amd64/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/amd64/Makefile ++++ b/usr/src/lib/libc/amd64/Makefile +@@ -396,6 +396,7 @@ PORTGEN= \ 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 b290a13..f3bb966 100644 --- a/libc/debian/patches/libc-add-getgrouplist.patch +++ b/libc/debian/patches/libc-add-getgrouplist.patch @@ -1,10 +1,10 @@ Index: b/usr/src/head/grp.h =================================================================== ---- 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__) +--- a/usr/src/head/grp.h ++++ b/usr/src/head/grp.h +@@ -52,6 +52,10 @@ struct group { /* see getgrent(3C) */ + char **gr_mem; + }; +#if defined(__EXTENSIONS__) || defined(_BSD_SOURCE) +int getgrouplist(const char *, gid_t, gid_t *, int *); @@ -15,9 +15,9 @@ Index: b/usr/src/head/grp.h Index: b/usr/src/lib/libc/amd64/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/amd64/Makefile ++++ b/usr/src/lib/libc/amd64/Makefile +@@ -203,6 +203,7 @@ COMSYSOBJS= \ getegid.o \ geteuid.o \ getgid.o \ @@ -27,9 +27,9 @@ Index: b/usr/src/lib/libc/amd64/Makefile getitimer.o \ Index: b/usr/src/lib/libc/i386/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/i386/Makefile.com ++++ b/usr/src/lib/libc/i386/Makefile.com +@@ -437,6 +437,7 @@ PORTGEN= \ getexecname.o \ getgrnam.o \ getgrnam_r.o \ @@ -39,8 +39,8 @@ Index: b/usr/src/lib/libc/i386/Makefile.com gethz.o \ Index: b/usr/src/lib/libc/port/gen/getgrouplist.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/usr/src/lib/libc/port/gen/getgrouplist.c 2014-03-02 23:24:04.758923273 +0400 +--- /dev/null ++++ b/usr/src/lib/libc/port/gen/getgrouplist.c @@ -0,0 +1,89 @@ +/* $OpenBSD: getgrouplist.c,v 1.12 2005/08/08 08:05:34 espie Exp $ */ +/* @@ -133,9 +133,9 @@ Index: b/usr/src/lib/libc/port/gen/getgrouplist.c +} Index: b/usr/src/lib/libc/port/mapfile-vers =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers +@@ -280,6 +280,7 @@ SYMBOL_VERSION DYSON_1 { 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 04f40f0..b6c87f8 100644 --- a/libc/debian/patches/libc-add-gnu-strerror_r.patch +++ b/libc/debian/patches/libc-add-gnu-strerror_r.patch @@ -1,8 +1,8 @@ Index: b/usr/src/lib/libc/port/gen/strerror.c =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/port/gen/strerror.c ++++ b/usr/src/lib/libc/port/gen/strerror.c +@@ -32,6 +32,7 @@ #include "lint.h" #include "_libc_gettext.h" @@ -10,7 +10,7 @@ Index: b/usr/src/lib/libc/port/gen/strerror.c #include <string.h> #include <sys/types.h> #include <errno.h> -@@ -77,3 +78,14 @@ +@@ -85,3 +86,14 @@ strerror_r(int errnum, char *strerrbuf, return (ret); } @@ -27,9 +27,9 @@ Index: b/usr/src/lib/libc/port/gen/strerror.c +} Index: b/usr/src/lib/libc/port/mapfile-vers =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers +@@ -275,6 +275,7 @@ SYMBOL_VERSION DYSON_1 { error_one_per_line; error_print_progname; flock; @@ -39,9 +39,9 @@ Index: b/usr/src/lib/libc/port/mapfile-vers program_invocation_name; Index: b/usr/src/head/string.h =================================================================== ---- 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 @@ +--- a/usr/src/head/string.h ++++ b/usr/src/head/string.h +@@ -69,7 +69,14 @@ extern "C" { #if defined(__EXTENSIONS__) || \ (!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX)) || \ defined(_XPG6) || defined(_REENTRANT) diff --git a/libc/debian/patches/libc-add-mempcpy.patch b/libc/debian/patches/libc-add-mempcpy.patch index e7b1a0c..db512fc 100644 --- a/libc/debian/patches/libc-add-mempcpy.patch +++ b/libc/debian/patches/libc-add-mempcpy.patch @@ -1,8 +1,8 @@ Index: b/usr/src/head/string.h =================================================================== ---- 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 @@ +--- a/usr/src/head/string.h ++++ b/usr/src/head/string.h +@@ -137,6 +137,11 @@ extern int strncasecmp(const char *, con extern char *strdup(const char *); #endif @@ -16,9 +16,9 @@ Index: b/usr/src/head/string.h #if defined(__GNUC__) Index: b/usr/src/lib/libc/amd64/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/amd64/Makefile ++++ b/usr/src/lib/libc/amd64/Makefile +@@ -457,6 +457,7 @@ PORTGEN= \ malloc.o \ memalign.o \ memmem.o \ @@ -28,9 +28,9 @@ Index: b/usr/src/lib/libc/amd64/Makefile mkfifo.o \ Index: b/usr/src/lib/libc/i386/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/i386/Makefile.com ++++ b/usr/src/lib/libc/i386/Makefile.com +@@ -490,6 +490,7 @@ PORTGEN= \ malloc.o \ memalign.o \ memmem.o \ @@ -40,8 +40,8 @@ Index: b/usr/src/lib/libc/i386/Makefile.com mkfifo.o \ Index: b/usr/src/lib/libc/port/gen/mempcpy.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/usr/src/lib/libc/port/gen/mempcpy.c 2014-03-02 23:23:14.079909698 +0400 +--- /dev/null ++++ b/usr/src/lib/libc/port/gen/mempcpy.c @@ -0,0 +1,8 @@ + +#include<string.h> @@ -53,9 +53,9 @@ Index: b/usr/src/lib/libc/port/gen/mempcpy.c + Index: b/usr/src/lib/libc/port/mapfile-vers =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers +@@ -267,6 +267,11 @@ $if lf64 $endif } ILLUMOS_0.3; diff --git a/libc/debian/patches/libc-add-mkostemp.patch b/libc/debian/patches/libc-add-mkostemp.patch index 6f13af2..0290201 100644 --- a/libc/debian/patches/libc-add-mkostemp.patch +++ b/libc/debian/patches/libc-add-mkostemp.patch @@ -1,7 +1,7 @@ -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 -+++ libc/usr/src/lib/libc/port/mapfile-vers +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers @@ -258,14 +258,7 @@ SYMBOL_VERSION ILLUMOS_0.4 { # Illumos a protected: pipe2; @@ -36,10 +36,10 @@ 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 -+++ libc/usr/src/head/stdlib.h +--- a/usr/src/head/stdlib.h ++++ b/usr/src/head/stdlib.h @@ -195,6 +195,10 @@ extern int mkstemp64(char *); #if !defined(_XPG4_2) || defined(__EXTENSIONS__) extern int mkstemps64(char *, int); diff --git a/libc/debian/patches/libc-add-qsort_r.patch b/libc/debian/patches/libc-add-qsort_r.patch index db4eab9..a320c2d 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 -+++ libc/usr/src/common/util/qsort.c +--- a/usr/src/common/util/qsort.c ++++ b/usr/src/common/util/qsort.c @@ -50,9 +50,15 @@ static void swapb(char *r1, char *r2, si * note: cstyle specifically prohibits nested conditional operators * but this is the only way to do the median of 3 function in-line @@ -79,10 +79,10 @@ 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 -+++ libc/usr/src/lib/libc/port/mapfile-vers +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers @@ -289,6 +289,7 @@ SYMBOL_VERSION DYSON_1 { memrchr; program_invocation_name; @@ -91,10 +91,10 @@ 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 -+++ libc/usr/src/lib/libc/i386/Makefile.com +--- a/usr/src/lib/libc/i386/Makefile.com ++++ b/usr/src/lib/libc/i386/Makefile.com @@ -101,6 +101,7 @@ COMOBJS= \ bsearch.o \ bzero.o \ @@ -103,17 +103,17 @@ 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 -+++ libc/usr/src/common/util/qsort_r.c ++++ b/usr/src/common/util/qsort_r.c @@ -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 -+++ libc/usr/src/lib/libc/amd64/Makefile +--- a/usr/src/lib/libc/amd64/Makefile ++++ b/usr/src/lib/libc/amd64/Makefile @@ -100,6 +100,7 @@ COMOBJS= \ bsearch.o \ bzero.o \ @@ -122,10 +122,10 @@ 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 -+++ libc/usr/src/head/stdlib.h +--- a/usr/src/head/stdlib.h ++++ b/usr/src/head/stdlib.h @@ -34,6 +34,8 @@ #ifndef _STDLIB_H #define _STDLIB_H diff --git a/libc/debian/patches/libc-add-sig_t.patch b/libc/debian/patches/libc-add-sig_t.patch index 2224f3b..59b7222 100644 --- a/libc/debian/patches/libc-add-sig_t.patch +++ b/libc/debian/patches/libc-add-sig_t.patch @@ -1,17 +1,17 @@ Index: b/usr/src/head/signal.h =================================================================== ---- 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 */ +--- a/usr/src/head/signal.h ++++ b/usr/src/head/signal.h +@@ -32,7 +32,7 @@ + #ifndef _SIGNAL_H + #define _SIGNAL_H -#include <sys/feature_tests.h> +#include <features.h> #if defined(__EXTENSIONS__) || !defined(_STRICT_STDC) || \ defined(__XOPEN_OR_POSIX) -@@ -57,6 +57,13 @@ +@@ -56,6 +56,13 @@ using std::raise; extern "C" { #endif @@ -23,5 +23,5 @@ Index: b/usr/src/head/signal.h +typedef __sighandler_t sig_t; +#endif - #if defined(__STDC__) - + extern const char **_sys_siglistp; /* signal descriptions */ + extern const int _sys_siglistn; /* # of signal descriptions */ diff --git a/libc/debian/patches/libc-add-tdestroy.patch b/libc/debian/patches/libc-add-tdestroy.patch index cdbc9e0..a571f72 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 -+++ libc/usr/src/head/search.h +--- a/usr/src/head/search.h ++++ b/usr/src/head/search.h @@ -32,7 +32,7 @@ #ifndef _SEARCH_H #define _SEARCH_H @@ -22,10 +22,10 @@ Index: libc/usr/src/head/search.h #if defined(__EXTENSIONS__) || !defined(_XOPEN_SOURCE) /* BSEARCH(3C) */ -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 -+++ libc/usr/src/lib/libc/port/mapfile-vers +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers @@ -280,6 +280,7 @@ SYMBOL_VERSION DYSON_1 { program_invocation_name; program_invocation_short_name; @@ -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 -+++ libc/usr/src/lib/libc/port/gen/tsearch.c +--- a/usr/src/lib/libc/port/gen/tsearch.c ++++ b/usr/src/lib/libc/port/gen/tsearch.c @@ -156,3 +156,23 @@ __twalk(NODE *root, /* Root of the tree (*action)(root, endorder, level); } diff --git a/libc/debian/patches/libc-add-wmempcpy.patch b/libc/debian/patches/libc-add-wmempcpy.patch index f2bdf60..1bae4d8 100644 --- a/libc/debian/patches/libc-add-wmempcpy.patch +++ b/libc/debian/patches/libc-add-wmempcpy.patch @@ -1,10 +1,10 @@ Index: b/usr/src/head/wchar.h =================================================================== ---- 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 @@ +--- a/usr/src/head/wchar.h ++++ b/usr/src/head/wchar.h +@@ -190,6 +190,10 @@ extern size_t mbsnrtowcs(wchar_t *_RESTR - #endif /* __STDC__ */ + #endif /* defined(_XPG7) || !defined(_STRICT_SYMBOLS) */ +#if defined(__EXTENSIONS__) || defined(_GNU_SOURCE) +extern wchar_t *wmempcpy(wchar_t *, const wchar_t *, size_t); @@ -15,9 +15,9 @@ Index: b/usr/src/head/wchar.h #endif Index: b/usr/src/lib/libc/port/mapfile-vers =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers +@@ -280,6 +280,7 @@ SYMBOL_VERSION DYSON_1 { program_invocation_name; program_invocation_short_name; rawmemchr; @@ -27,32 +27,32 @@ Index: b/usr/src/lib/libc/port/mapfile-vers SYMBOL_VERSION ILLUMOS_0.3 { # Illumos additions Index: b/usr/src/lib/libc/amd64/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/amd64/Makefile ++++ b/usr/src/lib/libc/amd64/Makefile +@@ -683,6 +683,7 @@ PORTI18N= \ wmemcmp.o \ wmemcpy.o \ wmemmove.o \ + wmempcpy.o \ wmemset.o \ - wscasecmp.o \ wscat.o \ + wschr.o \ Index: b/usr/src/lib/libc/i386/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/i386/Makefile.com ++++ b/usr/src/lib/libc/i386/Makefile.com +@@ -726,6 +726,7 @@ PORTI18N= \ wmemchr.o \ wmemcmp.o \ wmemcpy.o \ + wmempcpy.o \ wmemmove.o \ wmemset.o \ - wscasecmp.o \ + wscat.o \ Index: b/usr/src/lib/libc/port/i18n/wmempcpy.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/usr/src/lib/libc/port/i18n/wmempcpy.c 2014-03-02 23:23:42.107795924 +0400 +--- /dev/null ++++ b/usr/src/lib/libc/port/i18n/wmempcpy.c @@ -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 65205e9..f6b3bed 100644 --- a/libc/debian/patches/libc-conf-PATH.patch +++ b/libc/debian/patches/libc-conf-PATH.patch @@ -1,8 +1,8 @@ Index: b/usr/src/lib/libc/port/gen/confstr.c =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/port/gen/confstr.c ++++ b/usr/src/lib/libc/port/gen/confstr.c +@@ -101,13 +101,7 @@ confstr(int name, char *buf, size_t leng /* Keep _CS_PATH in sync with execvp.c */ if (name == _CS_PATH) { diff --git a/libc/debian/patches/libc-enable-xpg6.patch b/libc/debian/patches/libc-enable-xpg6.patch index bd2c020..78ae530 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: b/usr/src/lib/libc/port/gen/xpg6.c =================================================================== ---- 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 +--- a/usr/src/lib/libc/port/gen/xpg6.c ++++ b/usr/src/lib/libc/port/gen/xpg6.c @@ -49,6 +49,6 @@ #include "xpg6.h" @@ -13,8 +13,8 @@ Index: b/usr/src/lib/libc/port/gen/xpg6.c unsigned int libc__xpg6; /* copy of __xpg6, private to libc */ Index: b/usr/src/lib/libc/port/gen/xpg4.c =================================================================== ---- 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 +--- a/usr/src/lib/libc/port/gen/xpg4.c ++++ b/usr/src/lib/libc/port/gen/xpg4.c @@ -24,15 +24,6 @@ * Use is subject to license terms. */ diff --git a/libc/debian/patches/libc-fp_data-__huge_val.patch b/libc/debian/patches/libc-fp_data-__huge_val.patch index eb4f32c..f9e6d5a 100644 --- a/libc/debian/patches/libc-fp_data-__huge_val.patch +++ b/libc/debian/patches/libc-fp_data-__huge_val.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/lib/libc/port/fp/fp_data.c +Index: b/usr/src/lib/libc/port/fp/fp_data.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/fp/fp_data.c -+++ libc/usr/src/lib/libc/port/fp/fp_data.c +--- a/usr/src/lib/libc/port/fp/fp_data.c ++++ b/usr/src/lib/libc/port/fp/fp_data.c @@ -45,10 +45,10 @@ #include <sys/feature_tests.h> diff --git a/libc/debian/patches/libc-futimes.patch b/libc/debian/patches/libc-futimes.patch index 109d12f..b149e7b 100644 --- a/libc/debian/patches/libc-futimes.patch +++ b/libc/debian/patches/libc-futimes.patch @@ -1,8 +1,8 @@ Index: b/usr/src/lib/libc/port/sys/utimesys.c =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/port/sys/utimesys.c ++++ b/usr/src/lib/libc/port/sys/utimesys.c +@@ -38,6 +38,24 @@ futimens(int fd, const timespec_t times[ return (syscall(SYS_utimesys, 0, fd, times)); } @@ -29,9 +29,9 @@ Index: b/usr/src/lib/libc/port/sys/utimesys.c { Index: b/usr/src/lib/libc/port/mapfile-vers =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers +@@ -281,6 +281,7 @@ SYMBOL_VERSION DYSON_1 { fts_open; fts_read; fts_set; diff --git a/libc/debian/patches/libc-getopt-const-char.patch b/libc/debian/patches/libc-getopt-const-char.patch index 24a69c4..a36a657 100644 --- a/libc/debian/patches/libc-getopt-const-char.patch +++ b/libc/debian/patches/libc-getopt-const-char.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/head/getopt.h +Index: b/usr/src/head/getopt.h =================================================================== ---- libc.orig/usr/src/head/getopt.h -+++ libc/usr/src/head/getopt.h +--- a/usr/src/head/getopt.h ++++ b/usr/src/head/getopt.h @@ -49,7 +49,7 @@ extern "C" { #define optional_argument 2 diff --git a/libc/debian/patches/libc-include-time.h.patch b/libc/debian/patches/libc-include-time.h.patch index cf279a1..c646ef8 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 -+++ libc/usr/src/lib/libc/port/gen/waitpid.c +--- a/usr/src/lib/libc/port/gen/waitpid.c ++++ b/usr/src/lib/libc/port/gen/waitpid.c @@ -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 -+++ libc/usr/src/lib/libc/port/locale/strftime.c +--- a/usr/src/lib/libc/port/locale/strftime.c ++++ b/usr/src/lib/libc/port/locale/strftime.c @@ -23,6 +23,7 @@ #include <sys/stat.h> #include <string.h> diff --git a/libc/debian/patches/libc-malloc_usable_size.patch b/libc/debian/patches/libc-malloc_usable_size.patch index ab8c89e..0b31c27 100644 --- a/libc/debian/patches/libc-malloc_usable_size.patch +++ b/libc/debian/patches/libc-malloc_usable_size.patch @@ -1,8 +1,8 @@ Description: implemetes malloc_usable_size() - GNU extension -Index: libc/usr/src/head/malloc.h +Index: b/usr/src/head/malloc.h =================================================================== ---- libc.orig/usr/src/head/malloc.h -+++ libc/usr/src/head/malloc.h +--- a/usr/src/head/malloc.h ++++ b/usr/src/head/malloc.h @@ -70,6 +70,8 @@ void free(void *); void *realloc(void *, size_t); void *calloc(size_t, size_t); @@ -20,10 +20,10 @@ Index: libc/usr/src/head/malloc.h #endif /* __cplusplus >= 199711L */ #endif /* (!defined(_STRICT_STDC) && !defined(__XOPEN_OR_POSIX)) || ... */ -Index: libc/usr/src/lib/libc/port/gen/malloc.c +Index: b/usr/src/lib/libc/port/gen/malloc.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/gen/malloc.c -+++ libc/usr/src/lib/libc/port/gen/malloc.c +--- a/usr/src/lib/libc/port/gen/malloc.c ++++ b/usr/src/lib/libc/port/gen/malloc.c @@ -921,3 +921,8 @@ cleanfree(void *ptr) freeidx = 0; Lfree = NULL; @@ -33,11 +33,11 @@ Index: libc/usr/src/lib/libc/port/gen/malloc.c +{ + return SIZE(BLOCK(ptr)); +} -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 -+++ libc/usr/src/lib/libc/port/mapfile-vers -@@ -137,6 +137,7 @@ SYMBOL_VERSION DYSON_1 { +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers +@@ -279,6 +279,7 @@ SYMBOL_VERSION DYSON_1 { get_current_dir_name; getgrouplist; gnu_strerror_r; diff --git a/libc/debian/patches/libc-mman-protos.patch b/libc/debian/patches/libc-mman-protos.patch index 3dae529..3e8047e 100644 --- a/libc/debian/patches/libc-mman-protos.patch +++ b/libc/debian/patches/libc-mman-protos.patch @@ -1,10 +1,10 @@ Description: fix conflict with sys/mman.h due to "new-style" prototypes (with void*) are exposed by default instead of caddr_t -Index: libc/usr/src/lib/libc/port/gen/madvise.c +Index: b/usr/src/lib/libc/port/gen/madvise.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/gen/madvise.c -+++ libc/usr/src/lib/libc/port/gen/madvise.c +--- a/usr/src/lib/libc/port/gen/madvise.c ++++ b/usr/src/lib/libc/port/gen/madvise.c @@ -24,9 +24,6 @@ * Use is subject to license terms. */ @@ -24,10 +24,10 @@ Index: libc/usr/src/lib/libc/port/gen/madvise.c { return (memcntl(addr, len, MC_ADVISE, (caddr_t)(intptr_t)advice, 0, 0)); } -Index: libc/usr/src/lib/libc/port/gen/mlock.c +Index: b/usr/src/lib/libc/port/gen/mlock.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/gen/mlock.c -+++ libc/usr/src/lib/libc/port/gen/mlock.c +--- a/usr/src/lib/libc/port/gen/mlock.c ++++ b/usr/src/lib/libc/port/gen/mlock.c @@ -27,11 +27,9 @@ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ @@ -50,10 +50,10 @@ Index: libc/usr/src/lib/libc/port/gen/mlock.c - return (memcntl(addr, len, MC_LOCK, 0, 0, 0)); + return (memcntl((void *)addr, len, MC_LOCK, 0, 0, 0)); } -Index: libc/usr/src/lib/libc/port/gen/munlock.c +Index: b/usr/src/lib/libc/port/gen/munlock.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/gen/munlock.c -+++ libc/usr/src/lib/libc/port/gen/munlock.c +--- a/usr/src/lib/libc/port/gen/munlock.c ++++ b/usr/src/lib/libc/port/gen/munlock.c @@ -27,11 +27,8 @@ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ @@ -76,10 +76,10 @@ Index: libc/usr/src/lib/libc/port/gen/munlock.c - return (memcntl(addr, len, MC_UNLOCK, 0, 0, 0)); + return (memcntl((void *)addr, len, MC_UNLOCK, 0, 0, 0)); } -Index: libc/usr/src/lib/libc/port/threads/scalls.c +Index: b/usr/src/lib/libc/port/threads/scalls.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/threads/scalls.c -+++ libc/usr/src/lib/libc/port/threads/scalls.c +--- a/usr/src/lib/libc/port/threads/scalls.c ++++ b/usr/src/lib/libc/port/threads/scalls.c @@ -29,7 +29,6 @@ #define __USE_LEGACY_SIGWAIT diff --git a/libc/debian/patches/libc-no-gets.patch b/libc/debian/patches/libc-no-gets.patch index 8f8ed21..3465b27 100644 --- a/libc/debian/patches/libc-no-gets.patch +++ b/libc/debian/patches/libc-no-gets.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/head/iso/stdio_iso.h +Index: b/usr/src/head/iso/stdio_iso.h =================================================================== ---- libc.orig/usr/src/head/iso/stdio_iso.h -+++ libc/usr/src/head/iso/stdio_iso.h +--- a/usr/src/head/iso/stdio_iso.h ++++ b/usr/src/head/iso/stdio_iso.h @@ -238,7 +238,6 @@ extern int putc(int, FILE *); extern int getchar(void); extern int putchar(int); @@ -10,10 +10,10 @@ Index: libc/usr/src/head/iso/stdio_iso.h extern int puts(const char *); extern int ungetc(int, FILE *); extern size_t fread(void *_RESTRICT_KYWD, size_t, size_t, -Index: libc/usr/src/head/stdio.h +Index: b/usr/src/head/stdio.h =================================================================== ---- libc.orig/usr/src/head/stdio.h -+++ libc/usr/src/head/stdio.h +--- a/usr/src/head/stdio.h ++++ b/usr/src/head/stdio.h @@ -122,7 +122,6 @@ using std::fputc; using std::fputs; using std::getc; diff --git a/libc/debian/patches/libc-nvpair.h.patch b/libc/debian/patches/libc-nvpair.h.patch index 9ec7a64..b63832e 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: b/usr/src/lib/libc/inc/libc.h =================================================================== ---- 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 +--- a/usr/src/lib/libc/inc/libc.h ++++ b/usr/src/lib/libc/inc/libc.h @@ -49,7 +49,7 @@ #include <stdarg.h> #include <wchar.h> @@ -14,8 +14,8 @@ Index: b/usr/src/lib/libc/inc/libc.h extern "C" { Index: b/usr/src/lib/libc/port/gen/attrat.c =================================================================== ---- 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 +--- a/usr/src/lib/libc/port/gen/attrat.c ++++ b/usr/src/lib/libc/port/gen/attrat.c @@ -40,6 +40,10 @@ #include <stdio.h> #include <atomic.h> diff --git a/libc/debian/patches/libc-pipe.patch b/libc/debian/patches/libc-pipe.patch index 2ca491f..727bc74 100644 --- a/libc/debian/patches/libc-pipe.patch +++ b/libc/debian/patches/libc-pipe.patch @@ -1,10 +1,10 @@ Description: partially reverts "3714 Implement pipe2()" This keeps pipe() to call real syscall, not pipe2. So new libc will work on older kernel. -Index: libc/usr/src/lib/libc/port/gen/pipe.c +Index: b/usr/src/lib/libc/port/gen/pipe.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/gen/pipe.c 2014-03-01 16:18:12.000000000 +0400 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 +--- a/usr/src/lib/libc/port/gen/pipe.c ++++ /dev/null @@ -1,35 +0,0 @@ -/* - * CDDL HEADER START @@ -41,10 +41,10 @@ Index: libc/usr/src/lib/libc/port/gen/pipe.c -{ - return (pipe2(fds, 0)); -} -Index: libc/usr/src/lib/libc/amd64/sys/pipe.s +Index: b/usr/src/lib/libc/amd64/sys/pipe.s =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libc/usr/src/lib/libc/amd64/sys/pipe.s 2014-05-27 15:30:31.468443748 +0400 +--- /dev/null ++++ b/usr/src/lib/libc/amd64/sys/pipe.s @@ -0,0 +1,42 @@ +/* + * CDDL HEADER START @@ -88,10 +88,10 @@ Index: libc/usr/src/lib/libc/amd64/sys/pipe.s + movl %edx, 4(%rdi) + RETC + SET_SIZE(pipe) -Index: libc/usr/src/lib/libc/i386/sys/pipe.s +Index: b/usr/src/lib/libc/i386/sys/pipe.s =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libc/usr/src/lib/libc/i386/sys/pipe.s 2014-05-27 15:30:31.471284499 +0400 +--- /dev/null ++++ b/usr/src/lib/libc/i386/sys/pipe.s @@ -0,0 +1,41 @@ +/* + * CDDL HEADER START @@ -134,10 +134,10 @@ Index: libc/usr/src/lib/libc/i386/sys/pipe.s + movl %edx, 4(%ecx) + RETC + SET_SIZE(pipe) -Index: libc/usr/src/lib/libc/sparc/sys/pipe.s +Index: b/usr/src/lib/libc/sparc/sys/pipe.s =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libc/usr/src/lib/libc/sparc/sys/pipe.s 2014-05-27 15:30:31.473752142 +0400 +--- /dev/null ++++ b/usr/src/lib/libc/sparc/sys/pipe.s @@ -0,0 +1,52 @@ +/* + * CDDL HEADER START @@ -191,11 +191,11 @@ Index: libc/usr/src/lib/libc/sparc/sys/pipe.s + RETC + + SET_SIZE(pipe) -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-05-27 15:30:28.783929656 +0400 -+++ libc/usr/src/lib/libc/amd64/Makefile 2014-05-27 15:30:31.476425626 +0400 -@@ -286,6 +286,7 @@ +--- a/usr/src/lib/libc/amd64/Makefile ++++ b/usr/src/lib/libc/amd64/Makefile +@@ -296,6 +296,7 @@ SYSOBJS= \ gettimeofday.o \ lwp_private.o \ nuname.o \ @@ -203,7 +203,7 @@ Index: libc/usr/src/lib/libc/amd64/Makefile syscall.o \ sysi86.o \ tls_get_addr.o \ -@@ -479,7 +480,6 @@ +@@ -491,7 +492,6 @@ PORTGEN= \ pfmt.o \ pfmt_data.o \ pfmt_print.o \ @@ -211,11 +211,11 @@ Index: libc/usr/src/lib/libc/amd64/Makefile plock.o \ poll.o \ posix_fadvise.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-05-27 15:30:28.777874062 +0400 -+++ libc/usr/src/lib/libc/i386/Makefile.com 2014-05-27 15:30:31.478557142 +0400 -@@ -307,6 +307,7 @@ +--- a/usr/src/lib/libc/i386/Makefile.com ++++ b/usr/src/lib/libc/i386/Makefile.com +@@ -319,6 +319,7 @@ SYSOBJS= \ gettimeofday.o \ lwp_private.o \ nuname.o \ @@ -223,7 +223,7 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com ptrace.o \ syscall.o \ sysi86.o \ -@@ -510,7 +511,6 @@ +@@ -524,7 +525,6 @@ PORTGEN= \ pfmt.o \ pfmt_data.o \ pfmt_print.o \ @@ -231,10 +231,10 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com plock.o \ poll.o \ posix_fadvise.o \ -Index: libc/usr/src/lib/libc/common/sys/pipe2.s +Index: b/usr/src/lib/libc/common/sys/pipe2.s =================================================================== ---- libc.orig/usr/src/lib/libc/common/sys/pipe2.s 2014-03-01 16:18:11.000000000 +0400 -+++ libc/usr/src/lib/libc/common/sys/pipe2.s 2014-06-20 18:31:59.607739077 +0400 +--- a/usr/src/lib/libc/common/sys/pipe2.s ++++ b/usr/src/lib/libc/common/sys/pipe2.s @@ -27,6 +27,6 @@ .file "pipe2.s" diff --git a/libc/debian/patches/libc-printf-q-length-modifier.patch b/libc/debian/patches/libc-printf-q-length-modifier.patch index 2c84d25..b269d2b 100644 --- a/libc/debian/patches/libc-printf-q-length-modifier.patch +++ b/libc/debian/patches/libc-printf-q-length-modifier.patch @@ -2,9 +2,9 @@ Description: adds support for printf("%qx...") makes hexdump from bsdmainutils work Index: b/usr/src/lib/libc/port/print/doprnt.c =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/port/print/doprnt.c ++++ b/usr/src/lib/libc/port/print/doprnt.c +@@ -862,6 +862,14 @@ _ndoprnt(const char *format, va_list in_ 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 10a9225..dcf3450 100644 --- a/libc/debian/patches/libc-regex.h-define-REG_NOERROR.patch +++ b/libc/debian/patches/libc-regex.h-define-REG_NOERROR.patch @@ -1,9 +1,9 @@ Description: some apps use REG_NOERROR. Found in xfig Index: b/usr/src/head/regex.h =================================================================== ---- 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 @@ +--- a/usr/src/head/regex.h ++++ b/usr/src/head/regex.h +@@ -102,6 +102,7 @@ typedef ssize_t regoff_t; /* regcomp and regexec return codes */ #define REG_OK 0 /* success (non-standard) */ diff --git a/libc/debian/patches/libc-sprintf-nul-char.patch b/libc/debian/patches/libc-sprintf-nul-char.patch index 2b2b4bb..e08e671 100644 --- a/libc/debian/patches/libc-sprintf-nul-char.patch +++ b/libc/debian/patches/libc-sprintf-nul-char.patch @@ -3,9 +3,9 @@ Description: fixes sprintf(dest, "xxx%cyyy", '\0') This bug probably affects only short strings, see asprintf.c Index: b/usr/src/lib/libc/port/print/asprintf.c =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/port/print/asprintf.c ++++ b/usr/src/lib/libc/port/print/asprintf.c +@@ -49,7 +49,7 @@ vasprintf(char **str, const char *format len = ret + 1; if ((newstr = malloc(len)) == NULL) return (-1); /* retain errno from malloc() */ diff --git a/libc/debian/patches/libc-stropts.patch b/libc/debian/patches/libc-stropts.patch index 7af45eb..489864c 100644 --- a/libc/debian/patches/libc-stropts.patch +++ b/libc/debian/patches/libc-stropts.patch @@ -1,10 +1,10 @@ Description: stropts.h redefines a lot of things which breaks libc build with our new default options (like _XOPEN_SOURCE=600) -Index: libc/usr/src/lib/libc/port/threads/scalls.c +Index: b/usr/src/lib/libc/port/threads/scalls.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/threads/scalls.c -+++ libc/usr/src/lib/libc/port/threads/scalls.c +--- a/usr/src/lib/libc/port/threads/scalls.c ++++ b/usr/src/lib/libc/port/threads/scalls.c @@ -32,9 +32,9 @@ #include "thr_uberdata.h" #include <stdarg.h> diff --git a/libc/debian/patches/libc-uadmin-kiss.patch b/libc/debian/patches/libc-uadmin-kiss.patch index d4d852a..203dbaf 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: b/usr/src/lib/libc/i386/sys/uadmin.c =================================================================== ---- 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 +--- a/usr/src/lib/libc/i386/sys/uadmin.c ++++ b/usr/src/lib/libc/i386/sys/uadmin.c @@ -24,244 +24,11 @@ * Use is subject to license terms. */ @@ -250,8 +250,8 @@ Index: b/usr/src/lib/libc/i386/sys/uadmin.c } Index: b/usr/src/lib/libc/amd64/sys/uadmin.c =================================================================== ---- 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 +--- a/usr/src/lib/libc/amd64/sys/uadmin.c ++++ b/usr/src/lib/libc/amd64/sys/uadmin.c @@ -24,245 +24,11 @@ * Use is subject to license terms. */ diff --git a/libc/debian/patches/libcrypt-makefile.patch b/libc/debian/patches/libcrypt-makefile.patch index b12cfdf..efaa9dd 100644 --- a/libc/debian/patches/libcrypt-makefile.patch +++ b/libc/debian/patches/libcrypt-makefile.patch @@ -2,9 +2,9 @@ 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 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 @@ +--- a/usr/src/lib/libcrypt/Makefile.com ++++ b/usr/src/lib/libcrypt/Makefile.com +@@ -57,24 +57,4 @@ lint: lintcheck include ../../Makefile.targ diff --git a/libc/debian/patches/libelf-no-clobber-warning.patch b/libc/debian/patches/libelf-no-clobber-warning.patch index edc8764..9447125 100644 --- a/libc/debian/patches/libelf-no-clobber-warning.patch +++ b/libc/debian/patches/libelf-no-clobber-warning.patch @@ -3,11 +3,11 @@ Description: disable warnning ../misc/demangle.c:123:15: error: variable 'i' might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered] register int i = 0; -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 -+++ libc/usr/src/cmd/sgs/libelf/Makefile.com -@@ -70,6 +70,7 @@ LINTFLAGS64 += -u -erroff=E_CAST_INT_TO_ +--- a/usr/src/cmd/sgs/libelf/Makefile.com ++++ b/usr/src/cmd/sgs/libelf/Makefile.com +@@ -72,6 +72,7 @@ LINTFLAGS64 += -u -erroff=E_CAST_INT_TO_ CERRWARN += -_gcc=-Wno-parentheses CERRWARN += -_gcc=-Wno-uninitialized diff --git a/libc/debian/patches/libld-B_TRUE.patch b/libc/debian/patches/libld-B_TRUE.patch index 06fa566..b05a05b 100644 --- a/libc/debian/patches/libld-B_TRUE.patch +++ b/libc/debian/patches/libld-B_TRUE.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/cmd/sgs/libld/common/groups.c +Index: b/usr/src/cmd/sgs/libld/common/groups.c =================================================================== ---- libc.orig/usr/src/cmd/sgs/libld/common/groups.c -+++ libc/usr/src/cmd/sgs/libld/common/groups.c +--- a/usr/src/cmd/sgs/libld/common/groups.c ++++ b/usr/src/cmd/sgs/libld/common/groups.c @@ -30,6 +30,14 @@ #include "msg.h" #include "_libld.h" @@ -17,11 +17,11 @@ Index: libc/usr/src/cmd/sgs/libld/common/groups.c /* * Determine whether a (COMDAT) group has already been encountered. If so, * indicate that the group descriptor has an overriding group (gd_oisc). This -Index: libc/usr/src/cmd/sgs/libld/common/unwind.c +Index: b/usr/src/cmd/sgs/libld/common/unwind.c =================================================================== ---- libc.orig/usr/src/cmd/sgs/libld/common/unwind.c -+++ libc/usr/src/cmd/sgs/libld/common/unwind.c -@@ -32,6 +32,14 @@ +--- a/usr/src/cmd/sgs/libld/common/unwind.c ++++ b/usr/src/cmd/sgs/libld/common/unwind.c +@@ -33,6 +33,14 @@ #include <dwarf.h> #include <stdlib.h> diff --git a/libc/debian/patches/libld-reg.patch b/libc/debian/patches/libld-reg.patch index 6d1ed9f..b746782 100644 --- a/libc/debian/patches/libld-reg.patch +++ b/libc/debian/patches/libld-reg.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/cmd/sgs/libld/common/machrel.sparc.c +Index: b/usr/src/cmd/sgs/libld/common/machrel.sparc.c =================================================================== ---- libc.orig/usr/src/cmd/sgs/libld/common/machrel.sparc.c -+++ libc/usr/src/cmd/sgs/libld/common/machrel.sparc.c +--- a/usr/src/cmd/sgs/libld/common/machrel.sparc.c ++++ b/usr/src/cmd/sgs/libld/common/machrel.sparc.c @@ -829,6 +829,7 @@ ld_perform_outreloc(Rel_desc *orsp, Ofl_ #define FM3_REG_MSK_RS2 0x1f /* Formate (3) rs2 register mask */ /* bits 0->4 */ diff --git a/libc/debian/patches/libm-as.patch b/libc/debian/patches/libm-as.patch index e65256f..2071c05 100644 --- a/libc/debian/patches/libm-as.patch +++ b/libc/debian/patches/libm-as.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/lib/libm/common/C/libm.h +Index: b/usr/src/lib/libm/common/C/libm.h =================================================================== ---- libc.orig/usr/src/lib/libm/common/C/libm.h -+++ libc/usr/src/lib/libm/common/C/libm.h +--- a/usr/src/lib/libm/common/C/libm.h ++++ b/usr/src/lib/libm/common/C/libm.h @@ -52,9 +52,9 @@ #if defined(__sparc) diff --git a/libc/debian/patches/libm-fgnu89-inline.patch b/libc/debian/patches/libm-fgnu89-inline.patch index 5994091..f4d6d88 100644 --- a/libc/debian/patches/libm-fgnu89-inline.patch +++ b/libc/debian/patches/libm-fgnu89-inline.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/lib/libm/Makefile.libm.com +Index: b/usr/src/lib/libm/Makefile.libm.com =================================================================== ---- libc.orig/usr/src/lib/libm/Makefile.libm.com -+++ libc/usr/src/lib/libm/Makefile.libm.com +--- a/usr/src/lib/libm/Makefile.libm.com ++++ b/usr/src/lib/libm/Makefile.libm.com @@ -53,6 +53,11 @@ CPPFLAGS += -I$(LIBMSRC)/C \ CFLAGS += -_gcc=-D__C99FEATURES__ CFLAGS64 += -_gcc=-D__C99FEATURES__ diff --git a/libc/debian/patches/libm-i386-regs.patch b/libc/debian/patches/libm-i386-regs.patch index 86ac881..8b81905 100644 --- a/libc/debian/patches/libm-i386-regs.patch +++ b/libc/debian/patches/libm-i386-regs.patch @@ -2,10 +2,10 @@ Description: some macros in /usr/include/sys/regset.h were causing conflicts in a lot of applications. We have hidden them by the _I386_REGS macros, and need them anyway for libm -Index: libc/usr/src/lib/libm/Makefile.com +Index: b/usr/src/lib/libm/Makefile.com =================================================================== ---- libc.orig/usr/src/lib/libm/Makefile.com -+++ libc/usr/src/lib/libm/Makefile.com +--- a/usr/src/lib/libm/Makefile.com ++++ b/usr/src/lib/libm/Makefile.com @@ -327,7 +327,7 @@ ROBJS_amd64 = \ # # atan2pif.o, sincosf.o, sincospif.o are for internal use only diff --git a/libc/debian/patches/libnsl-avoid-libbsm.patch b/libc/debian/patches/libnsl-avoid-libbsm.patch index 087628e..9f3fd65 100644 --- a/libc/debian/patches/libnsl-avoid-libbsm.patch +++ b/libc/debian/patches/libnsl-avoid-libbsm.patch @@ -1,7 +1,7 @@ Index: b/usr/src/lib/libnsl/nss/getauuser.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/nss/getauuser.c ++++ b/usr/src/lib/libnsl/nss/getauuser.c @@ -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 66d65ec..1fe2c2c 100644 --- a/libc/debian/patches/libnsl-cxx-wtf.patch +++ b/libc/debian/patches/libnsl-cxx-wtf.patch @@ -2,9 +2,9 @@ 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 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 @@ +--- a/usr/src/lib/libnsl/Makefile.com ++++ b/usr/src/lib/libnsl/Makefile.com +@@ -154,10 +154,6 @@ pics/%.o: ../nis/gen/%.c ../nis/gen/nis_ $(POST_PROCESS_O) diff --git a/libc/debian/patches/libnsl-getdomainname.patch b/libc/debian/patches/libnsl-getdomainname.patch index 25d09a5..b9b76bb 100644 --- a/libc/debian/patches/libnsl-getdomainname.patch +++ b/libc/debian/patches/libnsl-getdomainname.patch @@ -1,8 +1,8 @@ Description: getdomainname is define in unistd and visible by default -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 -+++ libc/usr/src/lib/libnsl/yp/yp_bind.c +--- a/usr/src/lib/libnsl/yp/yp_bind.c ++++ b/usr/src/lib/libnsl/yp/yp_bind.c @@ -55,8 +55,6 @@ int __ypipbufsize = 8192; /* size used /* This should match the one in ypbind.c */ diff --git a/libc/debian/patches/libnsl-gnu-make.patch b/libc/debian/patches/libnsl-gnu-make.patch index c3e704b..142e682 100644 --- a/libc/debian/patches/libnsl-gnu-make.patch +++ b/libc/debian/patches/libnsl-gnu-make.patch @@ -4,9 +4,9 @@ Description: fixing installing into proto (debian/tmp) installed into debian/tmp Index: b/usr/src/lib/libnsl/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/lib/libnsl/Makefile ++++ b/usr/src/lib/libnsl/Makefile +@@ -85,7 +85,7 @@ all: $(PROTOCOL_DIR) $(DERIVED_FILES) . 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 e22023b..0d1ce91 100644 --- a/libc/debian/patches/libnsl-headers.patch +++ b/libc/debian/patches/libnsl-headers.patch @@ -1,7 +1,7 @@ Index: b/usr/src/lib/libnsl/des/des_crypt.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/des/des_crypt.c ++++ b/usr/src/lib/libnsl/des/des_crypt.c @@ -39,6 +39,7 @@ #include "mt.h" @@ -12,8 +12,8 @@ Index: b/usr/src/lib/libnsl/des/des_crypt.c #include <rpc/des_crypt.h> Index: b/usr/src/lib/libnsl/rpc/clnt_bcast.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/rpc/clnt_bcast.c ++++ b/usr/src/lib/libnsl/rpc/clnt_bcast.c @@ -43,6 +43,7 @@ #include "mt.h" @@ -24,9 +24,9 @@ Index: b/usr/src/lib/libnsl/rpc/clnt_bcast.c #include <rpc/rpc.h> Index: b/usr/src/lib/libnsl/rpc/clnt_dg.c =================================================================== ---- 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 @@ +--- a/usr/src/lib/libnsl/rpc/clnt_dg.c ++++ b/usr/src/lib/libnsl/rpc/clnt_dg.c +@@ -45,6 +45,7 @@ #include "mt.h" #include "rpc_mt.h" @@ -36,8 +36,8 @@ Index: b/usr/src/lib/libnsl/rpc/clnt_dg.c #include <errno.h> Index: b/usr/src/lib/libnsl/rpc/clnt_door.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/rpc/clnt_door.c ++++ b/usr/src/lib/libnsl/rpc/clnt_door.c @@ -45,6 +45,7 @@ #include <rpc/svc_mt.h> #include <sys/mman.h> @@ -48,8 +48,8 @@ Index: b/usr/src/lib/libnsl/rpc/clnt_door.c extern bool_t xdr_opaque_auth(XDR *, struct opaque_auth *); Index: b/usr/src/lib/libnsl/rpc/clnt_generic.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/rpc/clnt_generic.c ++++ b/usr/src/lib/libnsl/rpc/clnt_generic.c @@ -45,6 +45,8 @@ #include <netdir.h> #include <string.h> @@ -61,8 +61,8 @@ Index: b/usr/src/lib/libnsl/rpc/clnt_generic.c extern bool_t __rpc_is_local_host(const char *); Index: b/usr/src/lib/libnsl/rpc/clnt_simple.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/rpc/clnt_simple.c ++++ b/usr/src/lib/libnsl/rpc/clnt_simple.c @@ -47,6 +47,7 @@ #include <sys/param.h> #include <stdlib.h> @@ -73,9 +73,9 @@ Index: b/usr/src/lib/libnsl/rpc/clnt_simple.c #define MAXHOSTNAMELEN 64 Index: b/usr/src/lib/libnsl/rpc/clnt_vc.c =================================================================== ---- 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 @@ +--- a/usr/src/lib/libnsl/rpc/clnt_vc.c ++++ b/usr/src/lib/libnsl/rpc/clnt_vc.c +@@ -65,6 +65,9 @@ #include <syslog.h> #include <stdlib.h> #include <unistd.h> @@ -83,12 +83,12 @@ Index: b/usr/src/lib/libnsl/rpc/clnt_vc.c +#include <tiuser.h> +#include <string.h> #include <netinet/tcp.h> + #include <limits.h> - #define MCALL_MSG_SIZE 24 Index: b/usr/src/lib/libnsl/rpc/key_call.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/rpc/key_call.c ++++ b/usr/src/lib/libnsl/rpc/key_call.c @@ -53,6 +53,7 @@ #include <string.h> #include <stdlib.h> @@ -99,8 +99,8 @@ Index: b/usr/src/lib/libnsl/rpc/key_call.c Index: b/usr/src/lib/libnsl/rpc/rpc_callmsg.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/rpc/rpc_callmsg.c ++++ b/usr/src/lib/libnsl/rpc/rpc_callmsg.c @@ -37,6 +37,7 @@ #include "mt.h" @@ -111,8 +111,8 @@ Index: b/usr/src/lib/libnsl/rpc/rpc_callmsg.c #include <syslog.h> Index: b/usr/src/lib/libnsl/rpc/rpc_generic.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/rpc/rpc_generic.c ++++ b/usr/src/lib/libnsl/rpc/rpc_generic.c @@ -57,6 +57,7 @@ #include <sys/systeminfo.h> #include <netdir.h> @@ -123,8 +123,8 @@ Index: b/usr/src/lib/libnsl/rpc/rpc_generic.c NCONF_HANDLE *nhandle; Index: b/usr/src/lib/libnsl/rpc/rpc_prot.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/rpc/rpc_prot.c ++++ b/usr/src/lib/libnsl/rpc/rpc_prot.c @@ -48,6 +48,7 @@ #include <sys/param.h> #include <syslog.h> @@ -135,8 +135,8 @@ Index: b/usr/src/lib/libnsl/rpc/rpc_prot.c /* * * * * * * * * * * * * * XDR Authentication * * * * * * * * * * * */ Index: b/usr/src/lib/libnsl/rpc/rpc_soc.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/rpc/rpc_soc.c ++++ b/usr/src/lib/libnsl/rpc/rpc_soc.c @@ -62,6 +62,7 @@ #include <string.h> #include <stdlib.h> @@ -147,8 +147,8 @@ Index: b/usr/src/lib/libnsl/rpc/rpc_soc.c int __rpc_bindresvport_ipv6(int, struct sockaddr *, int *, int, char *); Index: b/usr/src/lib/libnsl/rpc/svc_auth_loopb.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/rpc/svc_auth_loopb.c ++++ b/usr/src/lib/libnsl/rpc/svc_auth_loopb.c @@ -35,6 +35,7 @@ #include "mt.h" #include <stdio.h> @@ -159,9 +159,9 @@ Index: b/usr/src/lib/libnsl/rpc/svc_auth_loopb.c Index: b/usr/src/lib/libnsl/rpc/svc_dg.c =================================================================== ---- 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 @@ +--- a/usr/src/lib/libnsl/rpc/svc_dg.c ++++ b/usr/src/lib/libnsl/rpc/svc_dg.c +@@ -51,6 +51,7 @@ #include <string.h> #include <ucred.h> #include <unistd.h> @@ -171,9 +171,9 @@ Index: b/usr/src/lib/libnsl/rpc/svc_dg.c #include <arpa/inet.h> Index: b/usr/src/lib/libnsl/rpc/svc_door.c =================================================================== ---- 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 @@ +--- a/usr/src/lib/libnsl/rpc/svc_door.c ++++ b/usr/src/lib/libnsl/rpc/svc_door.c +@@ -46,6 +46,7 @@ #include <alloca.h> #include <dlfcn.h> #include <limits.h> @@ -183,8 +183,8 @@ Index: b/usr/src/lib/libnsl/rpc/svc_door.c static void svc_door_destroy_pvt(); Index: b/usr/src/lib/libnsl/rpc/svc_generic.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/rpc/svc_generic.c ++++ b/usr/src/lib/libnsl/rpc/svc_generic.c @@ -33,6 +33,7 @@ */ @@ -195,8 +195,8 @@ Index: b/usr/src/lib/libnsl/rpc/svc_generic.c #include <netinet/in.h> Index: b/usr/src/lib/libnsl/rpc/svc_run.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/rpc/svc_run.c ++++ b/usr/src/lib/libnsl/rpc/svc_run.c @@ -53,6 +53,8 @@ #include <assert.h> #include <libintl.h> @@ -208,8 +208,8 @@ Index: b/usr/src/lib/libnsl/rpc/svc_run.c Index: b/usr/src/lib/libnsl/rpc/svc_simple.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/rpc/svc_simple.c ++++ b/usr/src/lib/libnsl/rpc/svc_simple.c @@ -45,6 +45,7 @@ #include "mt.h" #include "rpc_mt.h" @@ -220,8 +220,8 @@ Index: b/usr/src/lib/libnsl/rpc/svc_simple.c #include <string.h> Index: b/usr/src/lib/libnsl/rpc/svc_vc.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/rpc/svc_vc.c ++++ b/usr/src/lib/libnsl/rpc/svc_vc.c @@ -46,6 +46,7 @@ #include "mt.h" #include "rpc_mt.h" @@ -232,8 +232,8 @@ Index: b/usr/src/lib/libnsl/rpc/svc_vc.c #include <sys/types.h> Index: b/usr/src/lib/libnsl/rpc/ti_opts.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/rpc/ti_opts.c ++++ b/usr/src/lib/libnsl/rpc/ti_opts.c @@ -36,6 +36,7 @@ #include "mt.h" @@ -244,8 +244,8 @@ Index: b/usr/src/lib/libnsl/rpc/ti_opts.c #include <netinet/udp.h> Index: b/usr/src/lib/libnsl/yp/yp_bind.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/yp/yp_bind.c ++++ b/usr/src/lib/libnsl/yp/yp_bind.c @@ -34,6 +34,7 @@ #include "mt.h" #include "../rpc/rpc_mt.h" @@ -256,8 +256,8 @@ Index: b/usr/src/lib/libnsl/yp/yp_bind.c #include <sys/types.h> Index: b/usr/src/lib/libnsl/nis/gen/nis_subr.c =================================================================== ---- 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 +--- a/usr/src/lib/libnsl/nis/gen/nis_subr.c ++++ b/usr/src/lib/libnsl/nis/gen/nis_subr.c @@ -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 7627e7b..74cf2b9 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 2014-03-02 23:20:21.081043103 +0400 -+++ b/usr/src/lib/libnsl/ipsec/algs.c 2014-03-02 23:21:50.048970643 +0400 +--- a/usr/src/lib/libnsl/ipsec/algs.c ++++ b/usr/src/lib/libnsl/ipsec/algs.c @@ -28,7 +28,6 @@ #include <sys/types.h> #include <sys/errno.h> diff --git a/libc/debian/patches/libnsl-netname.patch b/libc/debian/patches/libnsl-netname.patch index 5cfdd65..164aaee 100644 --- a/libc/debian/patches/libnsl-netname.patch +++ b/libc/debian/patches/libnsl-netname.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/lib/libnsl/rpc/netname.c +Index: b/usr/src/lib/libnsl/rpc/netname.c =================================================================== ---- libc.orig/usr/src/lib/libnsl/rpc/netname.c -+++ libc/usr/src/lib/libnsl/rpc/netname.c +--- a/usr/src/lib/libnsl/rpc/netname.c ++++ b/usr/src/lib/libnsl/rpc/netname.c @@ -190,7 +190,7 @@ user2netname(char netname[MAXNETNAMELEN */ diff --git a/libc/debian/patches/libresolv-IN_SET_LOOPBACK_ADDR.patch b/libc/debian/patches/libresolv-IN_SET_LOOPBACK_ADDR.patch index 9b454ca..355baa3 100644 --- a/libc/debian/patches/libresolv-IN_SET_LOOPBACK_ADDR.patch +++ b/libc/debian/patches/libresolv-IN_SET_LOOPBACK_ADDR.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/lib/libresolv/resolv.h +Index: b/usr/src/lib/libresolv/resolv.h =================================================================== ---- libc.orig/usr/src/lib/libresolv/resolv.h -+++ libc/usr/src/lib/libresolv/resolv.h +--- a/usr/src/lib/libresolv/resolv.h ++++ b/usr/src/lib/libresolv/resolv.h @@ -43,6 +43,14 @@ #include <stdio.h> diff --git a/libc/debian/patches/libresolv-getdomainname.patch b/libc/debian/patches/libresolv-getdomainname.patch index 497a928..1d77703 100644 --- a/libc/debian/patches/libresolv-getdomainname.patch +++ b/libc/debian/patches/libresolv-getdomainname.patch @@ -1,10 +1,10 @@ Description: getdomainname is exposed by our new default options. This declaration conflicts the canonical one. -Index: libc/usr/src/lib/libresolv/res_init.c +Index: b/usr/src/lib/libresolv/res_init.c =================================================================== ---- libc.orig/usr/src/lib/libresolv/res_init.c -+++ libc/usr/src/lib/libresolv/res_init.c +--- a/usr/src/lib/libresolv/res_init.c ++++ b/usr/src/lib/libresolv/res_init.c @@ -55,12 +55,6 @@ #include <netinet/if_ether.h> #include <arpa/inet.h> diff --git a/libc/debian/patches/libresolv2-IN_SET_LOOPBACK_ADDR.patch b/libc/debian/patches/libresolv2-IN_SET_LOOPBACK_ADDR.patch index c1e85b0..d2ff080 100644 --- a/libc/debian/patches/libresolv2-IN_SET_LOOPBACK_ADDR.patch +++ b/libc/debian/patches/libresolv2-IN_SET_LOOPBACK_ADDR.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/lib/libresolv2/common/resolv/res_mkquery.c +Index: b/usr/src/lib/libresolv2/common/resolv/res_mkquery.c =================================================================== ---- libc.orig/usr/src/lib/libresolv2/common/resolv/res_mkquery.c -+++ libc/usr/src/lib/libresolv2/common/resolv/res_mkquery.c +--- a/usr/src/lib/libresolv2/common/resolv/res_mkquery.c ++++ b/usr/src/lib/libresolv2/common/resolv/res_mkquery.c @@ -98,6 +98,13 @@ static const char rcsid[] = "$Id: res_mk #include <string.h> #include "port_after.h" diff --git a/libc/debian/patches/libresolv2-socklen_t.patch b/libc/debian/patches/libresolv2-socklen_t.patch index 9d8d459..c536a70 100644 --- a/libc/debian/patches/libresolv2-socklen_t.patch +++ b/libc/debian/patches/libresolv2-socklen_t.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/lib/libresolv2/include/port_before.h +Index: b/usr/src/lib/libresolv2/include/port_before.h =================================================================== ---- libc.orig/usr/src/lib/libresolv2/include/port_before.h -+++ libc/usr/src/lib/libresolv2/include/port_before.h +--- a/usr/src/lib/libresolv2/include/port_before.h ++++ b/usr/src/lib/libresolv2/include/port_before.h @@ -182,7 +182,7 @@ struct timespec { #define UNUSED(x) (x) = (x) diff --git a/libc/debian/patches/librpcsvc-gnumake.patch b/libc/debian/patches/librpcsvc-gnumake.patch index aea1ed4..b43d57f 100644 --- a/libc/debian/patches/librpcsvc-gnumake.patch +++ b/libc/debian/patches/librpcsvc-gnumake.patch @@ -1,8 +1,8 @@ Index: b/usr/src/lib/librpcsvc/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/lib/librpcsvc/Makefile ++++ b/usr/src/lib/librpcsvc/Makefile +@@ -70,7 +70,8 @@ lint := TARGET= lint all: $(DERIVED_FILES) $(TXTS) .WAIT $(SUBDIRS) diff --git a/libc/debian/patches/librpcsvc-usr-lib.patch b/libc/debian/patches/librpcsvc-usr-lib.patch index c0b2854..c8322fe 100644 --- a/libc/debian/patches/librpcsvc-usr-lib.patch +++ b/libc/debian/patches/librpcsvc-usr-lib.patch @@ -1,8 +1,8 @@ Index: b/usr/src/lib/librpcsvc/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/lib/librpcsvc/Makefile.com ++++ b/usr/src/lib/librpcsvc/Makefile.com +@@ -36,9 +36,6 @@ OBJECTS= rstat_simple.o rstat_xdr.o ruse # include library definitions include ../../Makefile.lib diff --git a/libc/debian/patches/librpcsvc-uts-rpcsvc.patch b/libc/debian/patches/librpcsvc-uts-rpcsvc.patch index 72645a7..708c60e 100644 --- a/libc/debian/patches/librpcsvc-uts-rpcsvc.patch +++ b/libc/debian/patches/librpcsvc-uts-rpcsvc.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 -+++ libc/usr/src/lib/librpcsvc/Makefile +--- a/usr/src/lib/librpcsvc/Makefile ++++ b/usr/src/lib/librpcsvc/Makefile @@ -28,8 +28,8 @@ include ../../Makefile.master # Relative path to ensure path to header file is also relative diff --git a/libc/debian/patches/libsecdb-only-lib.patch b/libc/debian/patches/libsecdb-only-lib.patch index 9013bf7..5ca3f5b 100644 --- a/libc/debian/patches/libsecdb-only-lib.patch +++ b/libc/debian/patches/libsecdb-only-lib.patch @@ -4,9 +4,9 @@ Description: build and install only the library Index: b/usr/src/lib/libsecdb/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/lib/libsecdb/Makefile ++++ b/usr/src/lib/libsecdb/Makefile +@@ -75,12 +75,6 @@ $(CLASS_SCR_FILES) := FILEMODE = 0555 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 a85f7c6..4952101 100644 --- a/libc/debian/patches/libsocket-binutils-2.23-weak.patch +++ b/libc/debian/patches/libsocket-binutils-2.23-weak.patch @@ -5,8 +5,8 @@ Description: redefine_extname sets socket to __xnet_socket, Put all weak pragmas before headers so redefine_extname is not in action. Index: b/usr/src/lib/libsocket/socket/socket.c =================================================================== ---- 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 +--- a/usr/src/lib/libsocket/socket/socket.c ++++ b/usr/src/lib/libsocket/socket/socket.c @@ -35,6 +35,8 @@ * contributors. */ @@ -16,7 +16,7 @@ Index: b/usr/src/lib/libsocket/socket/socket.c #include <sys/types.h> #include <sys/socket.h> #include <sys/stropts.h> -@@ -50,8 +52,6 @@ +@@ -50,8 +52,6 @@ extern int _setsockopt(); int _socket_create(int, int, int, int); @@ -27,8 +27,8 @@ Index: b/usr/src/lib/libsocket/socket/socket.c { Index: b/usr/src/lib/libsocket/socket/socketpair.c =================================================================== ---- 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 +--- a/usr/src/lib/libsocket/socket/socketpair.c ++++ b/usr/src/lib/libsocket/socket/socketpair.c @@ -39,6 +39,8 @@ #pragma ident "%Z%%M% %I% %E% SMI" @@ -38,7 +38,7 @@ Index: b/usr/src/lib/libsocket/socket/socketpair.c #include <sys/types.h> #include <sys/socket.h> #include <sys/stropts.h> -@@ -53,8 +55,6 @@ +@@ -53,8 +55,6 @@ extern int _so_socketpair(int*); int _socketpair_create(int, int, int, int*, int); @@ -49,8 +49,8 @@ Index: b/usr/src/lib/libsocket/socket/socketpair.c { Index: b/usr/src/lib/libsocket/socket/weaks.c =================================================================== ---- 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 +--- a/usr/src/lib/libsocket/socket/weaks.c ++++ b/usr/src/lib/libsocket/socket/weaks.c @@ -26,21 +26,6 @@ /* Copyright (c) 2013, OmniTI Computer Consulting, Inc. All rights reserved. */ diff --git a/libc/debian/patches/libsocket-getaddrinfo.patch b/libc/debian/patches/libsocket-getaddrinfo.patch index 92de44e..4617da6 100644 --- a/libc/debian/patches/libsocket-getaddrinfo.patch +++ b/libc/debian/patches/libsocket-getaddrinfo.patch @@ -1,10 +1,10 @@ Description: _XOPEN_SOURCE=600 breaks compilation of this unit See /usr/include/netdb.h. Maybe it is bettr to patch old getaddrinfo out completely. -Index: libc/usr/src/lib/libsocket/inet/getaddrinfo.c +Index: b/usr/src/lib/libsocket/inet/getaddrinfo.c =================================================================== ---- libc.orig/usr/src/lib/libsocket/inet/getaddrinfo.c -+++ libc/usr/src/lib/libsocket/inet/getaddrinfo.c +--- a/usr/src/lib/libsocket/inet/getaddrinfo.c ++++ b/usr/src/lib/libsocket/inet/getaddrinfo.c @@ -25,6 +25,7 @@ */ diff --git a/libc/debian/patches/libsocket-socklen_t.patch b/libc/debian/patches/libsocket-socklen_t.patch index 7e1ac22..872bb05 100644 --- a/libc/debian/patches/libsocket-socklen_t.patch +++ b/libc/debian/patches/libsocket-socklen_t.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/lib/libsocket/inet/bindresvport.c +Index: b/usr/src/lib/libsocket/inet/bindresvport.c =================================================================== ---- libc.orig/usr/src/lib/libsocket/inet/bindresvport.c -+++ libc/usr/src/lib/libsocket/inet/bindresvport.c +--- a/usr/src/lib/libsocket/inet/bindresvport.c ++++ b/usr/src/lib/libsocket/inet/bindresvport.c @@ -57,7 +57,8 @@ bindresvport(int sd, struct sockaddr_in struct sockaddr_in myaddr; struct sockaddr_in *bindaddr; diff --git a/libc/debian/patches/localedef-prog-only.patch b/libc/debian/patches/localedef-prog-only.patch index 6e987e1..1a2c3d4 100644 --- a/libc/debian/patches/localedef-prog-only.patch +++ b/libc/debian/patches/localedef-prog-only.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/cmd/localedef/Makefile +Index: b/usr/src/cmd/localedef/Makefile =================================================================== ---- libc.orig/usr/src/cmd/localedef/Makefile -+++ libc/usr/src/cmd/localedef/Makefile +--- a/usr/src/cmd/localedef/Makefile ++++ b/usr/src/cmd/localedef/Makefile @@ -268,11 +268,11 @@ ROOTPRIVTRANS = $(PRIVTRANSLOCS:%=$(ROOT $(ROOTDATA) := FILEMODE=0444 diff --git a/libc/debian/patches/localedef-wcsdup.patch b/libc/debian/patches/localedef-wcsdup.patch index 83834ea..ea696c4 100644 --- a/libc/debian/patches/localedef-wcsdup.patch +++ b/libc/debian/patches/localedef-wcsdup.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/cmd/localedef/scanner.c +Index: b/usr/src/cmd/localedef/scanner.c =================================================================== ---- libc.orig/usr/src/cmd/localedef/scanner.c -+++ libc/usr/src/cmd/localedef/scanner.c +--- a/usr/src/cmd/localedef/scanner.c ++++ b/usr/src/cmd/localedef/scanner.c @@ -372,7 +372,7 @@ get_wcs(void) widestr = NULL; widesz = 0; diff --git a/libc/debian/patches/localedef.patch b/libc/debian/patches/localedef.patch index ece575f..88200fe 100644 --- a/libc/debian/patches/localedef.patch +++ b/libc/debian/patches/localedef.patch @@ -1,10 +1,10 @@ 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 -+++ libc/usr/src/cmd/localedef/Makefile +--- a/usr/src/cmd/localedef/Makefile ++++ b/usr/src/cmd/localedef/Makefile @@ -36,6 +36,7 @@ NATIVE_CPPFLAGS += -I $(SRC)/lib/libc/po CERRWARN += -_gcc=-Wno-char-subscripts CERRWARN += -_gcc=-Wno-uninitialized diff --git a/libc/debian/patches/localeimpl-getenv.patch b/libc/debian/patches/localeimpl-getenv.patch index 3ec18d9..d586dff 100644 --- a/libc/debian/patches/localeimpl-getenv.patch +++ b/libc/debian/patches/localeimpl-getenv.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/lib/libc/port/locale/localeimpl.c +Index: b/usr/src/lib/libc/port/locale/localeimpl.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/locale/localeimpl.c -+++ libc/usr/src/lib/libc/port/locale/localeimpl.c +--- a/usr/src/lib/libc/port/locale/localeimpl.c ++++ b/usr/src/lib/libc/port/locale/localeimpl.c @@ -22,6 +22,7 @@ #endif diff --git a/libc/debian/patches/mogrify-libc-mapfile-vers.patch b/libc/debian/patches/mogrify-libc-mapfile-vers.patch index 91821ec..7c370f8 100644 --- a/libc/debian/patches/mogrify-libc-mapfile-vers.patch +++ b/libc/debian/patches/mogrify-libc-mapfile-vers.patch @@ -1,8 +1,8 @@ Index: b/usr/src/lib/libc/amd64/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/amd64/Makefile ++++ b/usr/src/lib/libc/amd64/Makefile +@@ -1018,7 +1018,7 @@ ALTPICS= $(TRACEOBJS:%=pics/%) $(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS) @@ -11,7 +11,7 @@ Index: b/usr/src/lib/libc/amd64/Makefile CPPFLAGS= -D_REENTRANT -D$(MACH64) -D__$(MACH64) $(THREAD_DEBUG) \ -I. -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc $(CPPFLAGS.master) -@@ -1041,6 +1041,7 @@ +@@ -1057,6 +1057,7 @@ BUILD.AR= $(RM) $@ ; \ # extra files for the clean target CLEANFILES= \ @@ -21,9 +21,9 @@ Index: b/usr/src/lib/libc/amd64/Makefile assym.h \ Index: b/usr/src/lib/libc/i386/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/i386/Makefile.com ++++ b/usr/src/lib/libc/i386/Makefile.com +@@ -1064,7 +1064,7 @@ ALTPICS= $(TRACEOBJS:%=pics/%) $(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) \ $(EXTPICS) $(LDLIBS) @@ -32,7 +32,7 @@ Index: b/usr/src/lib/libc/i386/Makefile.com # # EXTN_CPPFLAGS and EXTN_CFLAGS set in enclosing Makefile -@@ -1096,6 +1096,7 @@ +@@ -1114,6 +1114,7 @@ BUILD.AR= $(RM) $@ ; \ # extra files for the clean target CLEANFILES= \ @@ -42,8 +42,8 @@ Index: b/usr/src/lib/libc/i386/Makefile.com assym.h \ Index: b/usr/src/lib/libc/Makefile.targ =================================================================== ---- 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 +--- a/usr/src/lib/libc/Makefile.targ ++++ b/usr/src/lib/libc/Makefile.targ @@ -26,6 +26,12 @@ # libc build rules diff --git a/libc/debian/patches/no-hwcap.patch b/libc/debian/patches/no-hwcap.patch index 412a229..5c19b8d 100644 --- a/libc/debian/patches/no-hwcap.patch +++ b/libc/debian/patches/no-hwcap.patch @@ -1,9 +1,9 @@ Description: do not build and install special version of libc Index: b/usr/src/lib/libc/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/Makefile ++++ b/usr/src/lib/libc/Makefile +@@ -73,7 +73,7 @@ VAR3_BLDDIR = $(MACH)_$(VAR3)/$(VARBLD) 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 6a26446..375f04d 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 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 @@ +--- a/usr/src/lib/libc/Makefile ++++ b/usr/src/lib/libc/Makefile +@@ -171,12 +171,10 @@ install: all \ inslib32 \ $(BUILD64) inslib64 diff --git a/libc/debian/patches/no-lvm.patch b/libc/debian/patches/no-lvm.patch index 2cc0602..6ae00d2 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 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 @@ +--- a/usr/src/head/Makefile ++++ b/usr/src/head/Makefile +@@ -282,8 +282,6 @@ RPCSVC_GEN_HDRS = \ ufs_prot.h \ nfs_acl.h diff --git a/libc/debian/patches/no-misleading-indentation.patch b/libc/debian/patches/no-misleading-indentation.patch index 0d285af..70773ae 100644 --- a/libc/debian/patches/no-misleading-indentation.patch +++ b/libc/debian/patches/no-misleading-indentation.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/Makefile.master +Index: b/usr/src/Makefile.master =================================================================== ---- libc.orig/usr/src/Makefile.master -+++ libc/usr/src/Makefile.master +--- a/usr/src/Makefile.master ++++ b/usr/src/Makefile.master @@ -385,6 +385,7 @@ CERRWARN += -_gcc=-Wno-sign-compare CERRWARN += -_gcc=-Wno-unknown-pragmas CERRWARN += -_gcc=-Wno-unused-parameter diff --git a/libc/debian/patches/no-unwind.patch b/libc/debian/patches/no-unwind.patch index 978206a..dad314f 100644 --- a/libc/debian/patches/no-unwind.patch +++ b/libc/debian/patches/no-unwind.patch @@ -49,11 +49,11 @@ Description: hide _Unwind_RaiseException #12 0x0000000000400aee in main () -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 -+++ libc/usr/src/lib/libc/port/mapfile-vers -@@ -838,17 +838,6 @@ $if amd64 +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers +@@ -980,17 +980,6 @@ $if amd64 _UA_FORCE_UNWIND; _UA_HANDLER_FRAME; _UA_SEARCH_PHASE; diff --git a/libc/debian/patches/nss-files-avoid-libtsnet.patch b/libc/debian/patches/nss-files-avoid-libtsnet.patch index d5911d2..5f504ed 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: b/usr/src/lib/nsswitch/files/common/tsol_getrhent.c =================================================================== ---- 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 +--- a/usr/src/lib/nsswitch/files/common/tsol_getrhent.c ++++ b/usr/src/lib/nsswitch/files/common/tsol_getrhent.c @@ -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 662b963..333bf0a 100644 --- a/libc/debian/patches/nss_compat-avoid-libbsm.patch +++ b/libc/debian/patches/nss_compat-avoid-libbsm.patch @@ -1,7 +1,7 @@ Index: b/usr/src/lib/nsswitch/compat/common/compat_common.c =================================================================== ---- 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 +--- a/usr/src/lib/nsswitch/compat/common/compat_common.c ++++ b/usr/src/lib/nsswitch/compat/common/compat_common.c @@ -32,7 +32,6 @@ #include <stdlib.h> #include <string.h> @@ -29,8 +29,8 @@ Index: b/usr/src/lib/nsswitch/compat/common/compat_common.c */ Index: b/usr/src/lib/nsswitch/compat/common/getauuser.c =================================================================== ---- 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 +--- a/usr/src/lib/nsswitch/compat/common/getauuser.c ++++ b/usr/src/lib/nsswitch/compat/common/getauuser.c @@ -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 dbca34f..d54baef 100644 --- a/libc/debian/patches/nss_files-avoid-libbsm.patch +++ b/libc/debian/patches/nss_files-avoid-libbsm.patch @@ -1,7 +1,7 @@ Index: b/usr/src/lib/nsswitch/files/common/getauuser.c =================================================================== ---- 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 +--- a/usr/src/lib/nsswitch/files/common/getauuser.c ++++ b/usr/src/lib/nsswitch/files/common/getauuser.c @@ -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 83b127a..24bb1e1 100644 --- a/libc/debian/patches/nss_nis-avoid-libbsm.patch +++ b/libc/debian/patches/nss_nis-avoid-libbsm.patch @@ -1,7 +1,7 @@ Index: b/usr/src/lib/nsswitch/nis/common/getauuser.c =================================================================== ---- 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 +--- a/usr/src/lib/nsswitch/nis/common/getauuser.c ++++ b/usr/src/lib/nsswitch/nis/common/getauuser.c @@ -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 51d81b6..c4a5555 100644 --- a/libc/debian/patches/nss_status-glibc-compat.patch +++ b/libc/debian/patches/nss_status-glibc-compat.patch @@ -1,8 +1,8 @@ Index: b/usr/src/head/nss_common.h =================================================================== ---- 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 @@ +--- a/usr/src/head/nss_common.h ++++ b/usr/src/head/nss_common.h +@@ -233,11 +233,15 @@ extern "C" { * is for nscd private/internal use only. */ diff --git a/libc/debian/patches/objects-path.patch b/libc/debian/patches/objects-path.patch index bddf61a..ea9d356 100644 --- a/libc/debian/patches/objects-path.patch +++ b/libc/debian/patches/objects-path.patch @@ -1,8 +1,8 @@ Index: b/usr/src/lib/common/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/lib/common/Makefile.com ++++ b/usr/src/lib/common/Makefile.com +@@ -40,8 +40,8 @@ POST_PROCESS_O = $(PROCESS_COMMENT) $@ ; 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 600506b..c0b66e0 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 2014-03-02 23:20:36.077189660 +0400 -+++ b/usr/src/lib/libc/extract-copyright.pl 2014-03-02 23:21:04.351090029 +0400 +--- a/usr/src/lib/libc/extract-copyright.pl ++++ b/usr/src/lib/libc/extract-copyright.pl @@ -1,4 +1,4 @@ -#! /usr/perl5/bin/perl +#!/usr/bin/perl diff --git a/libc/debian/patches/remove-statfs.patch b/libc/debian/patches/remove-statfs.patch index 833f767..89474f7 100644 --- a/libc/debian/patches/remove-statfs.patch +++ b/libc/debian/patches/remove-statfs.patch @@ -1,8 +1,8 @@ -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 -+++ libc/usr/src/lib/libc/port/mapfile-vers -@@ -1629,7 +1629,6 @@ $endif +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers +@@ -1769,7 +1769,6 @@ $endif fpgetsticky; fpsetmask; fpsetsticky; @@ -10,7 +10,7 @@ Index: libc/usr/src/lib/libc/port/mapfile-vers ftruncate; ftw; func_to_decimal; -@@ -1761,7 +1760,6 @@ $endif +@@ -1901,7 +1900,6 @@ $endif single_to_decimal; srand48; ssignal; @@ -18,11 +18,11 @@ Index: libc/usr/src/lib/libc/port/mapfile-vers str2sig; strcasecmp; string_to_decimal; -Index: libc/usr/src/lib/libc/amd64/Makefile +Index: b/usr/src/lib/libc/amd64/Makefile =================================================================== ---- libc.orig/usr/src/lib/libc/amd64/Makefile -+++ libc/usr/src/lib/libc/amd64/Makefile -@@ -190,7 +190,6 @@ COMSYSOBJS= \ +--- a/usr/src/lib/libc/amd64/Makefile ++++ b/usr/src/lib/libc/amd64/Makefile +@@ -197,7 +197,6 @@ COMSYSOBJS= \ fdsync.o \ flock.o \ fpathconf.o \ @@ -30,7 +30,7 @@ Index: libc/usr/src/lib/libc/amd64/Makefile fstatvfs.o \ getcpuid.o \ getdents.o \ -@@ -253,7 +252,6 @@ COMSYSOBJS= \ +@@ -263,7 +262,6 @@ COMSYSOBJS= \ sigprocmsk.o \ sigsendset.o \ sigsuspend.o \ @@ -38,11 +38,11 @@ Index: libc/usr/src/lib/libc/amd64/Makefile statvfs.o \ stty.o \ sync.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 -+++ libc/usr/src/lib/libc/i386/Makefile.com -@@ -212,7 +212,6 @@ COMSYSOBJS= \ +--- a/usr/src/lib/libc/i386/Makefile.com ++++ b/usr/src/lib/libc/i386/Makefile.com +@@ -221,7 +221,6 @@ COMSYSOBJS= \ fdsync.o \ flock.o \ fpathconf.o \ @@ -50,7 +50,7 @@ Index: libc/usr/src/lib/libc/i386/Makefile.com fstatvfs.o \ getcpuid.o \ getdents.o \ -@@ -274,7 +273,6 @@ COMSYSOBJS= \ +@@ -286,7 +285,6 @@ COMSYSOBJS= \ sigprocmsk.o \ sigsendset.o \ sigsuspend.o \ diff --git a/libc/debian/patches/rename-libavl.patch b/libc/debian/patches/rename-libavl.patch index 95cbf3c..9abdf9c 100644 --- a/libc/debian/patches/rename-libavl.patch +++ b/libc/debian/patches/rename-libavl.patch @@ -1,9 +1,9 @@ Index: b/usr/src/lib/libavl/Makefile.com =================================================================== ---- 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" +--- a/usr/src/lib/libavl/Makefile.com ++++ b/usr/src/lib/libavl/Makefile.com +@@ -23,7 +23,7 @@ + # Use is subject to license terms. # -LIBRARY= libavl.a diff --git a/libc/debian/patches/rpc_gss.patch b/libc/debian/patches/rpc_gss.patch index cac39f6..0649bb0 100644 --- a/libc/debian/patches/rpc_gss.patch +++ b/libc/debian/patches/rpc_gss.patch @@ -1,10 +1,10 @@ Description: rpc/rpc.h was refactored to fix conflicts of several gssapi.h headers. Now some hearder must be included directly. -Index: libc/usr/src/lib/libnsl/include/rpcsvc/nis_dhext.h +Index: b/usr/src/lib/libnsl/include/rpcsvc/nis_dhext.h =================================================================== ---- libc.orig/usr/src/lib/libnsl/include/rpcsvc/nis_dhext.h -+++ libc/usr/src/lib/libnsl/include/rpcsvc/nis_dhext.h +--- a/usr/src/lib/libnsl/include/rpcsvc/nis_dhext.h ++++ b/usr/src/lib/libnsl/include/rpcsvc/nis_dhext.h @@ -39,6 +39,7 @@ extern "C" { #include <rpc/rpc.h> @@ -13,10 +13,10 @@ Index: libc/usr/src/lib/libnsl/include/rpcsvc/nis_dhext.h #include <rpcsvc/nis.h> /* to get nis_server */ -Index: libc/usr/src/lib/libnsl/nis/gen/nis_misc_proc.c +Index: b/usr/src/lib/libnsl/nis/gen/nis_misc_proc.c =================================================================== ---- libc.orig/usr/src/lib/libnsl/nis/gen/nis_misc_proc.c -+++ libc/usr/src/lib/libnsl/nis/gen/nis_misc_proc.c +--- a/usr/src/lib/libnsl/nis/gen/nis_misc_proc.c ++++ b/usr/src/lib/libnsl/nis/gen/nis_misc_proc.c @@ -34,7 +34,7 @@ #include <syslog.h> #include <string.h> @@ -34,10 +34,10 @@ Index: libc/usr/src/lib/libnsl/nis/gen/nis_misc_proc.c extern int bin2hex(int len, unsigned char *binnum, char *hexnum); extern int hex2bin(int len, char *hexnum, char *binnum); -Index: libc/usr/src/lib/libnsl/rpc/rpc_mt.h +Index: b/usr/src/lib/libnsl/rpc/rpc_mt.h =================================================================== ---- libc.orig/usr/src/lib/libnsl/rpc/rpc_mt.h -+++ libc/usr/src/lib/libnsl/rpc/rpc_mt.h +--- a/usr/src/lib/libnsl/rpc/rpc_mt.h ++++ b/usr/src/lib/libnsl/rpc/rpc_mt.h @@ -35,6 +35,9 @@ #include <sys/types.h> @@ -48,10 +48,10 @@ Index: libc/usr/src/lib/libnsl/rpc/rpc_mt.h #include <netconfig.h> #ifdef __cplusplus -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 -+++ libc/usr/src/lib/libnsl/rpc/ti_opts.c +--- a/usr/src/lib/libnsl/rpc/ti_opts.c ++++ b/usr/src/lib/libnsl/rpc/ti_opts.c @@ -47,6 +47,8 @@ #include <net/if.h> #include <sys/sockio.h> diff --git a/libc/debian/patches/rpcinfo-MAX.patch b/libc/debian/patches/rpcinfo-MAX.patch index ad56855..b552f80 100644 --- a/libc/debian/patches/rpcinfo-MAX.patch +++ b/libc/debian/patches/rpcinfo-MAX.patch @@ -1,8 +1,8 @@ Index: b/usr/src/cmd/rpcinfo/rpcinfo.c =================================================================== ---- 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 @@ +--- a/usr/src/cmd/rpcinfo/rpcinfo.c ++++ b/usr/src/cmd/rpcinfo/rpcinfo.c +@@ -81,7 +81,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 e02a47d..9b7c1e7 100644 --- a/libc/debian/patches/rstat.x-stdc.patch +++ b/libc/debian/patches/rstat.x-stdc.patch @@ -1,7 +1,7 @@ Index: b/usr/src/head/rpcsvc/rstat.x =================================================================== ---- 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 +--- a/usr/src/head/rpcsvc/rstat.x ++++ b/usr/src/head/rpcsvc/rstat.x @@ -72,13 +72,7 @@ % */ % @@ -16,7 +16,7 @@ Index: b/usr/src/head/rpcsvc/rstat.x %{ % return (xdr_rstat_timeval(xdrs, (rstat_timeval *)tvp)); %} -@@ -167,12 +161,7 @@ +@@ -167,12 +161,7 @@ program RSTATPROG { #ifdef RPC_HDR % diff --git a/libc/debian/patches/rtld-mmapobj.patch b/libc/debian/patches/rtld-mmapobj.patch index a000eea..bb5a04c 100644 --- a/libc/debian/patches/rtld-mmapobj.patch +++ b/libc/debian/patches/rtld-mmapobj.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/cmd/sgs/rtld/common/analyze.c +Index: b/usr/src/cmd/sgs/rtld/common/analyze.c =================================================================== ---- libc.orig/usr/src/cmd/sgs/rtld/common/analyze.c -+++ libc/usr/src/cmd/sgs/rtld/common/analyze.c +--- a/usr/src/cmd/sgs/rtld/common/analyze.c ++++ b/usr/src/cmd/sgs/rtld/common/analyze.c @@ -48,6 +48,8 @@ #include "_inline_gen.h" #include "msg.h" diff --git a/libc/debian/patches/rusers.x-stdc.patch b/libc/debian/patches/rusers.x-stdc.patch index 8bbb723..8094888 100644 --- a/libc/debian/patches/rusers.x-stdc.patch +++ b/libc/debian/patches/rusers.x-stdc.patch @@ -1,8 +1,8 @@ Index: b/usr/src/head/rpcsvc/rusers.x =================================================================== ---- 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 @@ +--- a/usr/src/head/rpcsvc/rusers.x ++++ b/usr/src/head/rpcsvc/rusers.x +@@ -111,12 +111,7 @@ program RUSERSPROG { % %int xdr_utmpidlearr(); % diff --git a/libc/debian/patches/rwall.x-stdc.patch b/libc/debian/patches/rwall.x-stdc.patch index b5cab4e..dcce540 100644 --- a/libc/debian/patches/rwall.x-stdc.patch +++ b/libc/debian/patches/rwall.x-stdc.patch @@ -1,8 +1,8 @@ Index: b/usr/src/head/rpcsvc/rwall.x =================================================================== ---- 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 @@ +--- a/usr/src/head/rpcsvc/rwall.x ++++ b/usr/src/head/rpcsvc/rwall.x +@@ -60,10 +60,6 @@ program WALLPROG { #ifdef RPC_HDR % % diff --git a/libc/debian/patches/sendfile-in-libc.patch b/libc/debian/patches/sendfile-in-libc.patch index 7432834..6b30471 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: b/usr/src/lib/libc/port/sys/sendfile.c =================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/usr/src/lib/libc/port/sys/sendfile.c 2014-03-02 23:24:11.643087070 +0400 +--- /dev/null ++++ b/usr/src/lib/libc/port/sys/sendfile.c @@ -0,0 +1,139 @@ + +/* @@ -145,9 +145,9 @@ Index: b/usr/src/lib/libc/port/sys/sendfile.c + Index: b/usr/src/lib/libc/i386/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/i386/Makefile.com ++++ b/usr/src/lib/libc/i386/Makefile.com +@@ -944,6 +944,7 @@ PORTSYS= \ rename.o \ sbrk.o \ semsys.o \ @@ -157,9 +157,9 @@ Index: b/usr/src/lib/libc/i386/Makefile.com shmsys.o \ Index: b/usr/src/lib/libc/amd64/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/amd64/Makefile ++++ b/usr/src/lib/libc/amd64/Makefile +@@ -904,6 +904,7 @@ PORTSYS= \ rename.o \ sbrk.o \ semsys.o \ @@ -169,9 +169,9 @@ Index: b/usr/src/lib/libc/amd64/Makefile shmsys.o \ Index: b/usr/src/lib/libc/port/mapfile-vers =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers +@@ -287,6 +287,12 @@ SYMBOL_VERSION DYSON_1 { program_invocation_name; program_invocation_short_name; rawmemchr; diff --git a/libc/debian/patches/sgs-crle-multiarch.patch b/libc/debian/patches/sgs-crle-multiarch.patch index f7642c9..5226f53 100644 --- a/libc/debian/patches/sgs-crle-multiarch.patch +++ b/libc/debian/patches/sgs-crle-multiarch.patch @@ -6,9 +6,9 @@ Description: multiarch support for crle(1) /usr/lib32/crle for 32 bits on amd64 system. Index: b/usr/src/cmd/sgs/crle/common/crle.c =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/crle/common/crle.c ++++ b/usr/src/cmd/sgs/crle/common/crle.c +@@ -137,6 +137,7 @@ main(int argc, char **argv, char **envp) crle.c_flags |= CRLE_ADDID; crle.c_strbkts = 503; crle.c_inobkts = 251; @@ -16,7 +16,7 @@ Index: b/usr/src/cmd/sgs/crle/common/crle.c c_class = M_CLASS; /* -@@ -145,17 +146,16 @@ +@@ -145,17 +146,16 @@ main(int argc, char **argv, char **envp) while ((c = getopt(argc, argv, MSG_ORIG(MSG_ARG_OPTIONS))) != -1) { switch (c) { @@ -43,7 +43,7 @@ Index: b/usr/src/cmd/sgs/crle/common/crle.c case 'A': /* create optional */ /* FALLTHROUGH */ /* alternative */ case 'a': /* create alternative */ -@@ -256,6 +256,11 @@ +@@ -256,6 +256,11 @@ main(int argc, char **argv, char **envp) crle.c_flags |= CRLE_VERBOSE; break; @@ -55,7 +55,7 @@ Index: b/usr/src/cmd/sgs/crle/common/crle.c default: error = 2; } -@@ -321,34 +326,6 @@ +@@ -321,34 +326,6 @@ main(int argc, char **argv, char **envp) } } @@ -90,7 +90,7 @@ Index: b/usr/src/cmd/sgs/crle/common/crle.c if (crle.c_flags & CRLE_VERBOSE) (void) printf(MSG_INTL(MSG_DIA_CONFILE), crle.c_confil); -@@ -435,7 +412,7 @@ +@@ -435,7 +412,7 @@ main(int argc, char **argv, char **envp) * can access any directories. */ if (crle.c_flags & CRLE_DUMP) { @@ -99,7 +99,7 @@ Index: b/usr/src/cmd/sgs/crle/common/crle.c Aliste idx; int err = 0; -@@ -504,8 +481,9 @@ +@@ -504,8 +481,9 @@ main(int argc, char **argv, char **envp) switch (c) { @@ -113,8 +113,8 @@ Index: b/usr/src/cmd/sgs/crle/common/crle.c flag = RTC_OBJ_OPTINAL; Index: b/usr/src/cmd/sgs/crle/common/crle.msg =================================================================== ---- 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 +--- a/usr/src/cmd/sgs/crle/common/crle.msg ++++ b/usr/src/cmd/sgs/crle/common/crle.msg @@ -33,11 +33,10 @@ # Argument usage messages. @@ -201,9 +201,9 @@ Index: b/usr/src/cmd/sgs/crle/common/crle.msg @ MSG_CMD_CONF "-c %s" Index: b/usr/src/cmd/sgs/crle/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/crle/Makefile.com ++++ b/usr/src/cmd/sgs/crle/Makefile.com +@@ -36,13 +36,15 @@ TOOLSOBJ= alist.o OBJS= $(BLTOBJ) $(COMOBJ) $(TOOLSOBJ) @@ -226,8 +226,8 @@ Index: b/usr/src/cmd/sgs/crle/Makefile.com LDLIBS += -lelf $(CONVLIBDIR) $(CONV_LIB) $(DLLIB) Index: b/usr/src/cmd/sgs/crle/Makefile.targ =================================================================== ---- 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 +--- a/usr/src/cmd/sgs/crle/Makefile.targ ++++ b/usr/src/cmd/sgs/crle/Makefile.targ @@ -29,8 +29,14 @@ $(COMPILE.c) $< $(POST_PROCESS_O) @@ -246,9 +246,9 @@ Index: b/usr/src/cmd/sgs/crle/Makefile.targ Index: b/usr/src/cmd/sgs/crle/amd64/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/crle/amd64/Makefile ++++ b/usr/src/cmd/sgs/crle/amd64/Makefile +@@ -38,6 +38,7 @@ LDDBGLIBDIR = $(LDDBGLIBDIR64) LINTFLAGS64 += $(VAR_LINTFLAGS64) ROOTPROG = $(ROOTPROG64) @@ -258,9 +258,9 @@ Index: b/usr/src/cmd/sgs/crle/amd64/Makefile Index: b/usr/src/cmd/sgs/crle/common/_crle.h =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/crle/common/_crle.h ++++ b/usr/src/cmd/sgs/crle/common/_crle.h +@@ -154,6 +154,7 @@ typedef struct crle_desc { APlist *c_flt; /* filter/filtee associations */ uint_t c_fltrnum; /* and associated filter number */ uint_t c_fltenum; /* and associated filtee number */ @@ -270,8 +270,8 @@ Index: b/usr/src/cmd/sgs/crle/common/_crle.h #define CRLE_CREAT 0x0001 /* config file creation required */ Index: b/usr/src/cmd/sgs/crle/common/print.c =================================================================== ---- 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 +--- a/usr/src/cmd/sgs/crle/common/print.c ++++ b/usr/src/cmd/sgs/crle/common/print.c @@ -38,6 +38,19 @@ #include "_crle.h" #include "msg.h" @@ -292,7 +292,7 @@ Index: b/usr/src/cmd/sgs/crle/common/print.c /* * Display the command line required to regenerate the configuration file. -@@ -137,36 +150,12 @@ +@@ -137,36 +150,12 @@ fablib(Crle_desc * crle, int flag) switch (flag) { case CRLE_EDLIB: @@ -331,7 +331,7 @@ Index: b/usr/src/cmd/sgs/crle/common/print.c list = &crle->c_eslibpath; break; -@@ -340,11 +329,11 @@ +@@ -340,11 +329,11 @@ scanconfig(Crle_desc * crle, Addr addr, } @@ -345,7 +345,7 @@ Index: b/usr/src/cmd/sgs/crle/common/print.c if (aplist_append(&cmdline, cmd, AL_CNT_CRLE) == NULL) return (INSCFG_RET_FAIL); } -@@ -507,19 +496,7 @@ +@@ -507,19 +496,7 @@ scanconfig(Crle_desc * crle, Addr addr, /* * Indicate any system default. */ @@ -366,7 +366,7 @@ Index: b/usr/src/cmd/sgs/crle/common/print.c } } -@@ -574,19 +551,7 @@ +@@ -574,19 +551,7 @@ scanconfig(Crle_desc * crle, Addr addr, /* * Indicate any system default. */ @@ -387,7 +387,7 @@ Index: b/usr/src/cmd/sgs/crle/common/print.c } } -@@ -1076,27 +1041,12 @@ +@@ -1076,27 +1041,12 @@ inspectconfig(Crle_desc * crle, int c_cl #else fmt2 = MSG_INTL(MSG_DEF_AOUTOLDTD); #endif @@ -421,9 +421,9 @@ Index: b/usr/src/cmd/sgs/crle/common/print.c } Index: b/usr/src/man/man1/crle.1 =================================================================== ---- 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 @@ +--- a/usr/src/man/man1/crle.1 ++++ b/usr/src/man/man1/crle.1 +@@ -9,9 +9,9 @@ crle \- configure runtime linking enviro .SH SYNOPSIS .LP .nf @@ -435,7 +435,7 @@ Index: b/usr/src/man/man1/crle.1 .fi .SH DESCRIPTION -@@ -189,12 +189,12 @@ +@@ -189,12 +189,12 @@ The following options are supported. .sp .ne 2 .na @@ -451,7 +451,7 @@ Index: b/usr/src/man/man1/crle.1 .RE .sp -@@ -493,6 +493,16 @@ +@@ -493,6 +493,16 @@ is provided. .RE .sp diff --git a/libc/debian/patches/sgs-install-libconv.patch b/libc/debian/patches/sgs-install-libconv.patch index 273b3d3..700397f 100644 --- a/libc/debian/patches/sgs-install-libconv.patch +++ b/libc/debian/patches/sgs-install-libconv.patch @@ -3,9 +3,9 @@ Description: install static convenient library, This is needed to compile single (native) version of ldd Index: b/usr/src/cmd/sgs/libconv/amd64/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/libconv/amd64/Makefile ++++ b/usr/src/cmd/sgs/libconv/amd64/Makefile +@@ -31,7 +31,9 @@ include ../Makefile.com .PARALLEL: $(PICS) .KEEP_STATE: @@ -18,9 +18,9 @@ Index: b/usr/src/cmd/sgs/libconv/amd64/Makefile include ../../Makefile.sub.64 Index: b/usr/src/cmd/sgs/libconv/i386/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/libconv/i386/Makefile ++++ b/usr/src/cmd/sgs/libconv/i386/Makefile +@@ -31,6 +31,8 @@ include ../Makefile.com .PARALLEL: $(PICS) .KEEP_STATE: diff --git a/libc/debian/patches/sgs-ld.patch b/libc/debian/patches/sgs-ld.patch index f824827..8166904 100644 --- a/libc/debian/patches/sgs-ld.patch +++ b/libc/debian/patches/sgs-ld.patch @@ -1,7 +1,7 @@ Index: b/usr/src/cmd/sgs/ld/Makefile.com =================================================================== ---- 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 +--- a/usr/src/cmd/sgs/ld/Makefile.com ++++ b/usr/src/cmd/sgs/ld/Makefile.com @@ -23,7 +23,7 @@ # Copyright (c) 1994, 2010, Oracle and/or its affiliates. All rights reserved. # @@ -11,7 +11,7 @@ Index: b/usr/src/cmd/sgs/ld/Makefile.com include $(SRC)/cmd/Makefile.cmd include $(SRC)/cmd/sgs/Makefile.com -@@ -38,8 +38,8 @@ +@@ -38,8 +38,8 @@ MAPFILES = ../common/mapfile-intf $(MAPF MAPOPTS = $(MAPFILES:%=-M%) LDFLAGS += $(VERSREF) $(CC_USE_PROTO) $(MAPOPTS) $(VAR_LD_LLDFLAGS) @@ -24,8 +24,8 @@ Index: b/usr/src/cmd/sgs/ld/Makefile.com CERRWARN += -_gcc=-Wno-parentheses Index: b/usr/src/cmd/sgs/ld/Makefile.targ =================================================================== ---- 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 +--- a/usr/src/cmd/sgs/ld/Makefile.targ ++++ b/usr/src/cmd/sgs/ld/Makefile.targ @@ -29,7 +29,7 @@ all: $(PROG) @@ -37,9 +37,9 @@ Index: b/usr/src/cmd/sgs/ld/Makefile.targ $(COMPILE.c) $< Index: b/usr/src/cmd/sgs/ld/common/ld.c =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/ld/common/ld.c ++++ b/usr/src/cmd/sgs/ld/common/ld.c +@@ -313,14 +313,6 @@ getmore: break; case 'z': @@ -56,8 +56,8 @@ Index: b/usr/src/cmd/sgs/ld/common/ld.c MSG_ARG_TARGET_SIZE) == 0) { Index: b/usr/src/cmd/sgs/libld/common/libld.msg =================================================================== ---- 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 +--- a/usr/src/cmd/sgs/libld/common/libld.msg ++++ b/usr/src/cmd/sgs/libld/common/libld.msg @@ -142,7 +142,6 @@ allow extraction of\n\ \t\t\tarchive members to resolve weak references from \ @@ -68,9 +68,9 @@ Index: b/usr/src/cmd/sgs/libld/common/libld.msg the \n\t\t\tdefault search path\n\ Index: b/usr/src/cmd/sgs/libld/common/args.c =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/libld/common/args.c ++++ b/usr/src/cmd/sgs/libld/common/args.c +@@ -184,7 +184,6 @@ usage_mesg(Boolean detail) (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_CY)); (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZA)); (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZAE)); @@ -80,8 +80,8 @@ Index: b/usr/src/cmd/sgs/libld/common/args.c (void) fprintf(stderr, MSG_INTL(MSG_ARG_DETAIL_ZDEF)); Index: b/usr/src/man/man1/ld.1 =================================================================== ---- 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 +--- a/usr/src/man/man1/ld.1 ++++ b/usr/src/man/man1/ld.1 @@ -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 @@ -99,7 +99,7 @@ Index: b/usr/src/man/man1/ld.1 [\fB-B\fR dynamic | static] [\fB-B\fR eliminate] [\fB-B\fR group] [\fB-B\fR local] [\fB-B\fR reduce] [\fB-B\fR symbolic] [\fB-c\fR \fIname\fR] [\fB-C\fR] [\fB-d\fR y | n] [\fB-D\fR \fItoken\fR,...] [\fB-e\fR \fIepsym\fR] [\fB-f\fR \fIname\fR | \fB-F\fR \fIname\fR] [\fB-G\fR] [\fB-h\fR \fIname\fR] -@@ -19,7 +19,7 @@ +@@ -19,7 +19,7 @@ ld \- link-editor for object files [\fB-N\fR \fIstring\fR] [\fB-o\fR \fIoutfile\fR] [\fB-p\fR \fIauditlib\fR] [\fB-P\fR \fIauditlib\fR] [\fB-Q\fR y | n] [\fB-R\fR \fIpath\fR] [\fB-s\fR] [\fB-S\fR \fIsupportlib\fR] [\fB-t\fR] [\fB-u\fR \fIsymname\fR] [\fB-V\fR] [\fB-Y P\fR\fI,dirlist\fR] [\fB-z\fR absexec] @@ -108,7 +108,7 @@ Index: b/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] -@@ -41,10 +41,10 @@ +@@ -41,10 +41,10 @@ ld \- link-editor for object files .SH DESCRIPTION .sp .LP @@ -122,7 +122,7 @@ Index: b/usr/src/man/man1/ld.1 default. See NOTES. .sp .LP -@@ -64,12 +64,12 @@ +@@ -64,12 +64,12 @@ relocatable object file. See \fBStatic E .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: b/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 -@@ -84,8 +84,8 @@ +@@ -84,8 +84,8 @@ defined in the shared object are made av See Chapter 4, \fIShared Objects,\fR in \fILinker and Libraries Guide\fR .sp .LP @@ -148,7 +148,7 @@ Index: b/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 -@@ -96,8 +96,8 @@ +@@ -96,8 +96,8 @@ can require multiple command line defini Libraries Guide\fR. .sp .LP @@ -159,7 +159,7 @@ Index: b/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 -@@ -137,7 +137,7 @@ +@@ -137,7 +137,7 @@ performance. 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: b/usr/src/man/man1/ld.1 processing of archive libraries, remains unchanged. .SH OPTIONS .sp -@@ -330,7 +330,7 @@ +@@ -330,7 +330,7 @@ symbols to their definitions, if availab 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: b/usr/src/man/man1/ld.1 \fBdefs\fR overrides. .sp The \fB-B\fR \fBsymbolic\fR option is intended for specialized dynamic objects -@@ -368,8 +368,8 @@ +@@ -368,8 +368,8 @@ Demangles C++ symbol names displayed in .ad .sp .6 .RS 4n @@ -188,7 +188,7 @@ Index: b/usr/src/man/man1/ld.1 \fBStatic Executables\fR under DESCRIPTION, and \fB-B\fR \fBdynamic\fR|\fBstatic\fR. .RE -@@ -496,7 +496,7 @@ +@@ -496,7 +496,7 @@ search, which would interfere with the l 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: b/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 -@@ -514,16 +514,16 @@ +@@ -514,16 +514,16 @@ control to the interpreter rather than t .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: b/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 -@@ -539,7 +539,7 @@ +@@ -539,7 +539,7 @@ of \fB-l\fR is significant. See \fILinki .ad .sp .6 .RS 4n @@ -228,7 +228,7 @@ Index: b/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 -@@ -569,7 +569,7 @@ +@@ -569,7 +569,7 @@ any non-fatal multiply-defined symbols, .ad .sp .6 .RS 4n @@ -237,7 +237,7 @@ Index: b/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 -@@ -645,9 +645,9 @@ +@@ -645,9 +645,9 @@ Guide\fR. .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: b/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. -@@ -665,7 +665,7 @@ +@@ -665,7 +665,7 @@ sections can be manipulated by the \fBmc .sp .6 .RS 4n Combines relocatable object files to produce one relocatable object file. @@ -259,7 +259,7 @@ Index: b/usr/src/man/man1/ld.1 used with the \fB-a\fR option. .RE -@@ -728,7 +728,7 @@ +@@ -728,7 +728,7 @@ and \fB-z\fR \fBnoldynsym\fR options. .ad .sp .6 .RS 4n @@ -268,7 +268,7 @@ Index: b/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 -@@ -776,7 +776,7 @@ +@@ -776,7 +776,7 @@ Additional Symbols with the u option\fR .ad .sp .6 .RS 4n @@ -277,7 +277,7 @@ Index: b/usr/src/man/man1/ld.1 .RE .sp -@@ -830,26 +830,11 @@ +@@ -830,26 +830,11 @@ Guide\fR. .sp .ne 2 .na @@ -305,7 +305,7 @@ Index: b/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 -@@ -857,7 +842,7 @@ +@@ -857,7 +842,7 @@ applied. The \fB-z\fR \fBnocombreloc\fR relocation sections, and preserves the one-to-one relationship found in the original relocatable objects. .sp @@ -314,7 +314,7 @@ Index: b/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 -@@ -996,7 +981,7 @@ +@@ -996,7 +981,7 @@ Auditing Interface\fR in \fILinker and L .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: b/usr/src/man/man1/ld.1 .RE .sp -@@ -1215,7 +1200,7 @@ +@@ -1215,7 +1200,7 @@ and Libraries Guide\fR. .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: b/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 -@@ -1224,7 +1209,7 @@ +@@ -1224,7 +1209,7 @@ support library can be ensured using: .sp .in +2 .nf @@ -341,7 +341,7 @@ Index: b/usr/src/man/man1/ld.1 .fi .in -2 .sp -@@ -1232,7 +1217,7 @@ +@@ -1232,7 +1217,7 @@ support library can be ensured using: 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: b/usr/src/man/man1/ld.1 .RE .sp -@@ -1246,7 +1231,7 @@ +@@ -1246,7 +1231,7 @@ Marks a filter to indicate that filtees 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: b/usr/src/man/man1/ld.1 .RE .sp -@@ -1385,7 +1370,7 @@ +@@ -1385,7 +1370,7 @@ Does not record any versioning sections. 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: b/usr/src/man/man1/ld.1 .RE .sp -@@ -1436,9 +1421,9 @@ +@@ -1436,9 +1421,9 @@ options. .ad .sp .6 .RS 4n @@ -380,7 +380,7 @@ Index: b/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. -@@ -1519,7 +1504,7 @@ +@@ -1519,7 +1504,7 @@ command line. If no objects are specifie 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: b/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 -@@ -1636,7 +1621,7 @@ +@@ -1636,7 +1621,7 @@ occurring. .ad .sp .6 .RS 4n @@ -398,7 +398,7 @@ Index: b/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. -@@ -1661,11 +1646,11 @@ +@@ -1661,11 +1646,11 @@ by a semicolon: .in -2 .sp @@ -412,7 +412,7 @@ Index: b/usr/src/man/man1/ld.1 .fi .in -2 .sp -@@ -1712,13 +1697,13 @@ +@@ -1712,13 +1697,13 @@ find the use of the 32-bit link-editor f .ad .sp .6 .RS 4n @@ -430,7 +430,7 @@ Index: b/usr/src/man/man1/ld.1 .fi .in -2 .sp -@@ -1748,15 +1733,15 @@ +@@ -1748,15 +1733,15 @@ Provides a colon-separated list of share 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: b/usr/src/man/man1/ld.1 .SH FILES .sp .ne 2 -@@ -1836,7 +1821,7 @@ +@@ -1836,7 +1821,7 @@ Interface Stability Committed .SH NOTES .sp .LP @@ -458,7 +458,7 @@ Index: b/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 -@@ -1845,22 +1830,22 @@ +@@ -1845,22 +1830,22 @@ manual. For a description of the current \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 c3cc9a4..66daaf8 100644 --- a/libc/debian/patches/sgs-ldd.patch +++ b/libc/debian/patches/sgs-ldd.patch @@ -1,8 +1,8 @@ Index: b/usr/src/cmd/sgs/ldd/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/ldd/Makefile.com ++++ b/usr/src/cmd/sgs/ldd/Makefile.com +@@ -35,16 +35,15 @@ TOOLSOBJ= alist.o OBJS= $(BLTOBJ) $(COMOBJ) $(TOOLSOBJ) diff --git a/libc/debian/patches/sgs-lddstub.patch b/libc/debian/patches/sgs-lddstub.patch index 0bff03a..f38326f 100644 --- a/libc/debian/patches/sgs-lddstub.patch +++ b/libc/debian/patches/sgs-lddstub.patch @@ -1,7 +1,7 @@ Index: b/usr/src/cmd/sgs/lddstub/Makefile.targ =================================================================== ---- 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 +--- a/usr/src/cmd/sgs/lddstub/Makefile.targ ++++ b/usr/src/cmd/sgs/lddstub/Makefile.targ @@ -30,10 +30,16 @@ all: $(PROG) @@ -21,9 +21,9 @@ Index: b/usr/src/cmd/sgs/lddstub/Makefile.targ Index: b/usr/src/cmd/sgs/lddstub/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/lddstub/Makefile.com ++++ b/usr/src/cmd/sgs/lddstub/Makefile.com +@@ -35,8 +35,6 @@ include ../../Makefile.com # As of Solaris 9 the kernel accepts $ORIGIN within the interpreter field. @@ -34,9 +34,9 @@ Index: b/usr/src/cmd/sgs/lddstub/Makefile.com $(LDFLAGS.cmd) Index: b/usr/src/cmd/sgs/lddstub/amd64/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/lddstub/amd64/Makefile ++++ b/usr/src/cmd/sgs/lddstub/amd64/Makefile +@@ -34,7 +34,9 @@ CONVLIBDIR= $(CONVLIBDIR64) ASFLAGS += -D__amd64 $(amd64_AS_XARCH) @@ -49,9 +49,9 @@ Index: b/usr/src/cmd/sgs/lddstub/amd64/Makefile include ../../Makefile.sub.64 Index: b/usr/src/cmd/sgs/lddstub/i386/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/lddstub/i386/Makefile ++++ b/usr/src/cmd/sgs/lddstub/i386/Makefile +@@ -29,6 +29,9 @@ include ../Makefile.com .KEEP_STATE: @@ -64,8 +64,8 @@ Index: b/usr/src/cmd/sgs/lddstub/i386/Makefile include ../Makefile.targ Index: b/usr/src/cmd/sgs/libconv/common/lddstub.c =================================================================== ---- 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 +--- a/usr/src/cmd/sgs/libconv/common/lddstub.c ++++ b/usr/src/cmd/sgs/libconv/common/lddstub.c @@ -31,27 +31,6 @@ #include "_conv.h" #include "lddstub_msg.h" @@ -94,7 +94,7 @@ Index: b/usr/src/cmd/sgs/libconv/common/lddstub.c /* * Determine what lddstub to run. */ -@@ -60,47 +39,10 @@ +@@ -60,47 +39,10 @@ conv_lddstub(int class) { const char *stub; @@ -146,9 +146,9 @@ Index: b/usr/src/cmd/sgs/libconv/common/lddstub.c } Index: b/usr/src/cmd/sgs/libconv/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/libconv/Makefile.com ++++ b/usr/src/cmd/sgs/libconv/Makefile.com +@@ -100,6 +100,10 @@ PICS= $(OBJECTS:%=pics/%) 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 375ca0f..0557ce1 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 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 +--- a/usr/src/cmd/sgs/libconv/common/demangle.c ++++ b/usr/src/cmd/sgs/libconv/common/demangle.c @@ -24,7 +24,6 @@ */ @@ -23,7 +23,7 @@ Index: b/usr/src/cmd/sgs/libconv/common/demangle.c static char _str[SYM_MAX], *str = _str; static size_t size = SYM_MAX; static int again = 1; -@@ -112,4 +114,5 @@ +@@ -112,4 +114,5 @@ conv_demangle_name(const char *name) return ((const char *)str); } return (name); diff --git a/libc/debian/patches/sgs-libconv-makefile.patch b/libc/debian/patches/sgs-libconv-makefile.patch index 469c7a8..226d218 100644 --- a/libc/debian/patches/sgs-libconv-makefile.patch +++ b/libc/debian/patches/sgs-libconv-makefile.patch @@ -2,8 +2,8 @@ Description: Fixes for GNU make Index: b/usr/src/cmd/sgs/libconv/Makefile.targ =================================================================== ---- 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 +--- a/usr/src/cmd/sgs/libconv/Makefile.targ ++++ b/usr/src/cmd/sgs/libconv/Makefile.targ @@ -24,20 +24,21 @@ # Use is subject to license terms. # @@ -32,7 +32,7 @@ Index: b/usr/src/cmd/sgs/libconv/Makefile.targ $(POST_PROCESS_O) pics/elfcap.o: $(ELFCAP)/elfcap.c -@@ -57,10 +58,11 @@ +@@ -57,10 +58,11 @@ report_bufsize.h: ../Makefile.targ perl ../../tools/libconv_mk_report_bufsize.pl 8000 ../common/%.c ../common/%_machelf.c: %_msg.h diff --git a/libc/debian/patches/sgs-libdl-filter.patch b/libc/debian/patches/sgs-libdl-filter.patch index 18c08b2..2febaab 100644 --- a/libc/debian/patches/sgs-libdl-filter.patch +++ b/libc/debian/patches/sgs-libdl-filter.patch @@ -1,8 +1,8 @@ Index: b/usr/src/cmd/sgs/libdl/amd64/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/libdl/amd64/Makefile ++++ b/usr/src/cmd/sgs/libdl/amd64/Makefile +@@ -27,7 +27,7 @@ include $(SRC)/lib/Makefile.filter.com include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 @@ -13,8 +13,8 @@ Index: b/usr/src/cmd/sgs/libdl/amd64/Makefile Index: b/usr/src/cmd/sgs/libdl/i386/Makefile =================================================================== ---- 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 +--- a/usr/src/cmd/sgs/libdl/i386/Makefile ++++ b/usr/src/cmd/sgs/libdl/i386/Makefile @@ -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 ee82589..0b86487 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 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 @@ +--- a/usr/src/cmd/sgs/libelf/Makefile.com ++++ b/usr/src/cmd/sgs/libelf/Makefile.com +@@ -74,8 +74,8 @@ CERRWARN += -_gcc=-Wno-parentheses 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 6649a45..b386e7f 100644 --- a/libc/debian/patches/sgs-libelf-headers.patch +++ b/libc/debian/patches/sgs-libelf-headers.patch @@ -1,7 +1,7 @@ Index: b/usr/src/cmd/sgs/libelf/common/data.c =================================================================== ---- 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 +--- a/usr/src/cmd/sgs/libelf/common/data.c ++++ b/usr/src/cmd/sgs/libelf/common/data.c @@ -27,6 +27,7 @@ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ @@ -12,8 +12,8 @@ Index: b/usr/src/cmd/sgs/libelf/common/data.c Index: b/usr/src/cmd/sgs/libelf/common/getbase.c =================================================================== ---- 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 +--- a/usr/src/cmd/sgs/libelf/common/getbase.c ++++ b/usr/src/cmd/sgs/libelf/common/getbase.c @@ -26,6 +26,7 @@ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ @@ -24,8 +24,8 @@ Index: b/usr/src/cmd/sgs/libelf/common/getbase.c #include "decl.h" Index: b/usr/src/cmd/sgs/libelf/common/rand.c =================================================================== ---- 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 +--- a/usr/src/cmd/sgs/libelf/common/rand.c ++++ b/usr/src/cmd/sgs/libelf/common/rand.c @@ -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 f2ef2f6..cb66d7f 100644 --- a/libc/debian/patches/sgs-libelf-no-demos.patch +++ b/libc/debian/patches/sgs-libelf-no-demos.patch @@ -1,8 +1,8 @@ Index: b/usr/src/cmd/sgs/libelf/Makefile.targ =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/libelf/Makefile.targ ++++ b/usr/src/cmd/sgs/libelf/Makefile.targ +@@ -46,7 +46,6 @@ all: $(BLTSRCS) .WAIT $(LIBS) $(LIBLINK install: all .WAIT $(ROOTFS_LIBS) $(ROOTFS_LINKS) \ $(ROOTFS_LINTLIB) \ diff --git a/libc/debian/patches/sgs-libelf-nolint.patch b/libc/debian/patches/sgs-libelf-nolint.patch index 563ff7a..ee1fcef 100644 --- a/libc/debian/patches/sgs-libelf-nolint.patch +++ b/libc/debian/patches/sgs-libelf-nolint.patch @@ -1,8 +1,8 @@ Index: b/usr/src/cmd/sgs/libelf/Makefile.targ =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/libelf/Makefile.targ ++++ b/usr/src/cmd/sgs/libelf/Makefile.targ +@@ -44,9 +44,7 @@ pics/%.o: ../common/%.c all: $(BLTSRCS) .WAIT $(LIBS) $(LIBLINKS) diff --git a/libc/debian/patches/sgs-libelf-rename.patch b/libc/debian/patches/sgs-libelf-rename.patch index 5d9cbb5..33ee0d2 100644 --- a/libc/debian/patches/sgs-libelf-rename.patch +++ b/libc/debian/patches/sgs-libelf-rename.patch @@ -1,13 +1,13 @@ Index: b/usr/src/cmd/sgs/libelf/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/libelf/Makefile.com ++++ b/usr/src/cmd/sgs/libelf/Makefile.com +@@ -23,7 +23,7 @@ # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved. # -LIBRARY= libelf.a +LIBRARY= libsunelf.a VERS= .1 - M4= m4 + MACHOBJS= diff --git a/libc/debian/patches/sgs-libld-lib64.patch b/libc/debian/patches/sgs-libld-lib64.patch index f75f33a..60e9570 100644 --- a/libc/debian/patches/sgs-libld-lib64.patch +++ b/libc/debian/patches/sgs-libld-lib64.patch @@ -1,8 +1,8 @@ Index: b/usr/src/cmd/sgs/libld/amd64/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/libld/amd64/Makefile ++++ b/usr/src/cmd/sgs/libld/amd64/Makefile +@@ -30,8 +30,6 @@ include ../Makefile.com .KEEP_STATE: diff --git a/libc/debian/patches/sgs-liblddbg-lib64.patch b/libc/debian/patches/sgs-liblddbg-lib64.patch index e4af536..c4a1047 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 2014-03-02 23:20:29.154033990 +0400 -+++ b/usr/src/cmd/sgs/liblddbg/amd64/Makefile 2014-03-02 23:21:25.821402123 +0400 +--- a/usr/src/cmd/sgs/liblddbg/amd64/Makefile ++++ b/usr/src/cmd/sgs/liblddbg/amd64/Makefile @@ -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 542fd29..10b696a 100644 --- a/libc/debian/patches/sgs-librtld_db-nolint.patch +++ b/libc/debian/patches/sgs-librtld_db-nolint.patch @@ -1,8 +1,8 @@ Index: b/usr/src/cmd/sgs/librtld_db/amd64/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/librtld_db/amd64/Makefile ++++ b/usr/src/cmd/sgs/librtld_db/amd64/Makefile +@@ -40,7 +40,6 @@ CONVLIBDIR = $(CONVLIBDIR64) all: $(DYNLIB) $(LINTLIB) install: all $(ROOTFS_DYNLIB64) $(ROOTFS_LINKS64) \ @@ -12,9 +12,9 @@ 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 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 @@ +--- a/usr/src/cmd/sgs/librtld_db/i386/Makefile ++++ b/usr/src/cmd/sgs/librtld_db/i386/Makefile +@@ -38,7 +38,6 @@ SGSMSGTARG += $(SGSMSGINTEL) all: $(DYNLIB) $(LINTLIB) install: all $(ROOTFS_DYNLIB) $(ROOTFS_LINKS) \ diff --git a/libc/debian/patches/sgs-rtld-default-lib-path.patch b/libc/debian/patches/sgs-rtld-default-lib-path.patch index 6b02a3b..db7d346 100644 --- a/libc/debian/patches/sgs-rtld-default-lib-path.patch +++ b/libc/debian/patches/sgs-rtld-default-lib-path.patch @@ -3,8 +3,8 @@ Description: set default library search path consistent with crle. Index: b/usr/src/cmd/sgs/rtld/common/elf.c =================================================================== ---- 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 +--- a/usr/src/cmd/sgs/rtld/common/elf.c ++++ b/usr/src/cmd/sgs/rtld/common/elf.c @@ -52,24 +52,40 @@ /* * Default and secure dependency search paths. @@ -59,9 +59,9 @@ Index: b/usr/src/cmd/sgs/rtld/common/elf.c }; Index: b/usr/src/cmd/sgs/rtld/Makefile.com =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/rtld/Makefile.com ++++ b/usr/src/cmd/sgs/rtld/Makefile.com +@@ -81,6 +81,14 @@ CPPFLAGS += -I$(SRCBASE)/lib/libc/inc \ -I$(ELFCAP) \ $(CPPFEATUREMACROS) diff --git a/libc/debian/patches/sgs-rtld.patch b/libc/debian/patches/sgs-rtld.patch index 7896355..1afeeef 100644 --- a/libc/debian/patches/sgs-rtld.patch +++ b/libc/debian/patches/sgs-rtld.patch @@ -1,8 +1,8 @@ Index: b/usr/src/cmd/sgs/rtld/Makefile.targ =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/rtld/Makefile.targ ++++ b/usr/src/cmd/sgs/rtld/Makefile.targ +@@ -67,7 +67,7 @@ pics/elfcap.o: $(ELFCAP)/elfcap.c $(POST_PROCESS_O) $(RTLD): pics $(PICS) $(CRTS) @@ -13,9 +13,9 @@ Index: b/usr/src/cmd/sgs/rtld/Makefile.targ Index: b/usr/src/cmd/sgs/rtld/amd64/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/rtld/amd64/Makefile ++++ b/usr/src/cmd/sgs/rtld/amd64/Makefile +@@ -69,7 +69,7 @@ ADBGENCFLAGS += -erroff=%all ADBSUB= $(ADBSUB64) CPPFLAGS += -D_ELF64 LINTFLAGS64 += $(VAR_LINTFLAGS64) @@ -26,9 +26,9 @@ Index: b/usr/src/cmd/sgs/rtld/amd64/Makefile Index: b/usr/src/cmd/sgs/rtld/i386/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/rtld/i386/Makefile ++++ b/usr/src/cmd/sgs/rtld/i386/Makefile +@@ -66,7 +66,7 @@ include $(SRC)/cmd/sgs/rtld/Makefile.co ADBGENCFLAGS += -erroff=%all ADBGENFLAGS += -milp32 ADBSUB= $(ADBSUB32) @@ -39,8 +39,8 @@ Index: b/usr/src/cmd/sgs/rtld/i386/Makefile Index: b/usr/src/cmd/sgs/rtld/Makefile =================================================================== ---- 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 +--- a/usr/src/cmd/sgs/rtld/Makefile ++++ b/usr/src/cmd/sgs/rtld/Makefile @@ -25,6 +25,6 @@ include $(SRC)/cmd/sgs/Makefile.com @@ -51,9 +51,9 @@ Index: b/usr/src/cmd/sgs/rtld/Makefile include $(SRC)/cmd/sgs/Makefile.sub Index: b/usr/src/cmd/sgs/rtld/common/elf.c =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/rtld/common/elf.c ++++ b/usr/src/cmd/sgs/rtld/common/elf.c +@@ -139,9 +139,9 @@ elf_fix_name(const char *name, Rt_map *c if (((*name == '/') && /* BEGIN CSTYLED */ #if defined(_ELF64) @@ -65,7 +65,7 @@ Index: b/usr/src/cmd/sgs/rtld/common/elf.c #endif (strcmp(name, MSG_ORIG(MSG_FIL_RTLD)) == 0)) { /* END CSTYLED */ -@@ -986,9 +986,9 @@ +@@ -986,9 +986,9 @@ _elf_lookup_filtee(Slookup *slp, Sresult * libdl.so.1, which is a filter on ld.so.1. */ #if defined(_ELF64) diff --git a/libc/debian/patches/sgs.h-no-libelf.h.patch b/libc/debian/patches/sgs.h-no-libelf.h.patch index d339220..6a998f0 100644 --- a/libc/debian/patches/sgs.h-no-libelf.h.patch +++ b/libc/debian/patches/sgs.h-no-libelf.h.patch @@ -3,9 +3,9 @@ Descriptions: libelf.h is not used does not search debian/tmp/usr/include Index: b/usr/src/cmd/sgs/include/sgs.h =================================================================== ---- 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 @@ +--- a/usr/src/cmd/sgs/include/sgs.h ++++ b/usr/src/cmd/sgs/include/sgs.h +@@ -48,7 +48,6 @@ extern "C" { #include <sys/machelf.h> #include <stdlib.h> #include <stdarg.h> diff --git a/libc/debian/patches/stdio.h-includes-features.h.patch b/libc/debian/patches/stdio.h-includes-features.h.patch index 1d9257a..c275e1c 100644 --- a/libc/debian/patches/stdio.h-includes-features.h.patch +++ b/libc/debian/patches/stdio.h-includes-features.h.patch @@ -1,9 +1,9 @@ Description: We need __EXTENSIONS__ if _GNU_SOURCE is defined Index: b/usr/src/head/stdio.h =================================================================== ---- 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 @@ +--- a/usr/src/head/stdio.h ++++ b/usr/src/head/stdio.h +@@ -34,7 +34,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 cda54fb..b648d02 100644 --- a/libc/debian/patches/stdlib-includes-alloca.patch +++ b/libc/debian/patches/stdlib-includes-alloca.patch @@ -1,8 +1,8 @@ Index: b/usr/src/head/stdlib.h =================================================================== ---- 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 @@ +--- a/usr/src/head/stdlib.h ++++ b/usr/src/head/stdlib.h +@@ -41,6 +41,11 @@ #include <sys/wait.h> #endif diff --git a/libc/debian/patches/string-strings.patch b/libc/debian/patches/string-strings.patch index de0d413..32381c1 100644 --- a/libc/debian/patches/string-strings.patch +++ b/libc/debian/patches/string-strings.patch @@ -1,8 +1,8 @@ -Index: libc/usr/src/head/string.h +Index: b/usr/src/head/string.h =================================================================== ---- libc.orig/usr/src/head/string.h -+++ libc/usr/src/head/string.h -@@ -30,6 +30,7 @@ +--- a/usr/src/head/string.h ++++ b/usr/src/head/string.h +@@ -31,6 +31,7 @@ #define _STRING_H #include <iso/string_iso.h> diff --git a/libc/debian/patches/struct-tm.patch b/libc/debian/patches/struct-tm.patch index bc4b9e0..8942b67 100644 --- a/libc/debian/patches/struct-tm.patch +++ b/libc/debian/patches/struct-tm.patch @@ -1,10 +1,10 @@ Description: add GNU extensions for struct tm. This might be incomplete. Omly localtime() and gmtime() work. -Index: libc/usr/src/head/iso/time_iso.h +Index: b/usr/src/head/iso/time_iso.h =================================================================== ---- libc.orig/usr/src/head/iso/time_iso.h -+++ libc/usr/src/head/iso/time_iso.h +--- a/usr/src/head/iso/time_iso.h ++++ b/usr/src/head/iso/time_iso.h @@ -44,7 +44,7 @@ #ifndef _ISO_TIME_ISO_H #define _ISO_TIME_ISO_H @@ -51,10 +51,10 @@ Index: libc/usr/src/head/iso/time_iso.h #if __cplusplus >= 199711L } #endif /* end of namespace std */ -Index: libc/usr/src/head/time.h +Index: b/usr/src/head/time.h =================================================================== ---- libc.orig/usr/src/head/time.h -+++ libc/usr/src/head/time.h +--- a/usr/src/head/time.h ++++ b/usr/src/head/time.h @@ -35,7 +35,7 @@ #ifndef _TIME_H #define _TIME_H @@ -111,10 +111,10 @@ Index: libc/usr/src/head/time.h extern int cftime(char *, char *, const time_t *); extern int ascftime(char *, const char *, const struct tm *); extern long altzone; -Index: libc/usr/src/lib/libc/port/gen/localtime.c +Index: b/usr/src/lib/libc/port/gen/localtime.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/gen/localtime.c -+++ libc/usr/src/lib/libc/port/gen/localtime.c +--- a/usr/src/lib/libc/port/gen/localtime.c ++++ b/usr/src/lib/libc/port/gen/localtime.c @@ -88,6 +88,8 @@ * Functions that are common to ctime(3C) and cftime(3C) */ @@ -251,10 +251,10 @@ Index: libc/usr/src/lib/libc/port/gen/localtime.c /* * Sets extern global zone state variables based on the current -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 -+++ libc/usr/src/lib/libc/port/mapfile-vers +--- a/usr/src/lib/libc/port/mapfile-vers ++++ b/usr/src/lib/libc/port/mapfile-vers @@ -262,6 +262,10 @@ SYMBOL_VERSION ILLUMOS_0.4 { # Illumos a SYMBOL_VERSION DYSON_1 { diff --git a/libc/debian/patches/syslog-LOG_PERROR.patch b/libc/debian/patches/syslog-LOG_PERROR.patch index ebcced3..097a2f9 100644 --- a/libc/debian/patches/syslog-LOG_PERROR.patch +++ b/libc/debian/patches/syslog-LOG_PERROR.patch @@ -2,9 +2,9 @@ Descriptio: logging to stderr output is slightly different from glibc (timestamp added) Index: b/usr/src/lib/libc/port/gen/syslog.c =================================================================== ---- 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 @@ +--- a/usr/src/lib/libc/port/gen/syslog.c ++++ b/usr/src/lib/libc/port/gen/syslog.c +@@ -338,9 +338,7 @@ vsyslog(int pri, const char *fmt, va_lis dat.buf = outline; /* output the message to the local logger */ @@ -15,7 +15,7 @@ Index: b/usr/src/lib/libc/port/gen/syslog.c return; /* -@@ -353,6 +351,15 @@ +@@ -353,6 +351,15 @@ vsyslog(int pri, const char *fmt, va_lis clen = strlen(outline) + 1; @@ -33,9 +33,9 @@ Index: b/usr/src/lib/libc/port/gen/syslog.c if (pid == -1) Index: b/usr/src/head/syslog.h =================================================================== ---- 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 @@ +--- a/usr/src/head/syslog.h ++++ b/usr/src/head/syslog.h +@@ -33,6 +33,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 c80944e..ff4191f 100644 --- a/libc/debian/patches/syslog-names.patch +++ b/libc/debian/patches/syslog-names.patch @@ -1,10 +1,10 @@ Index: b/usr/src/head/syslog.h =================================================================== ---- 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 */ +--- a/usr/src/head/syslog.h ++++ b/usr/src/head/syslog.h +@@ -29,10 +29,70 @@ + #ifndef _SYSLOG_H + #define _SYSLOG_H -#include <sys/feature_tests.h> +#include <features.h> 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 8b447f7..d3c6272 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,7 +1,7 @@ Index: b/usr/src/lib/libc/inc/thr_uberdata.h =================================================================== ---- 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 +--- a/usr/src/lib/libc/inc/thr_uberdata.h ++++ b/usr/src/lib/libc/inc/thr_uberdata.h @@ -55,7 +55,6 @@ #include <sys/priocntl.h> #include <thread_db.h> @@ -12,8 +12,8 @@ Index: b/usr/src/lib/libc/inc/thr_uberdata.h Index: b/usr/src/lib/libc/port/threads/thr.c =================================================================== ---- 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 +--- a/usr/src/lib/libc/port/threads/thr.c ++++ b/usr/src/lib/libc/port/threads/thr.c @@ -33,6 +33,7 @@ #include <sys/uio.h> #include <ctype.h> @@ -24,8 +24,8 @@ Index: b/usr/src/lib/libc/port/threads/thr.c * These symbols should not be exported from libc, but Index: b/usr/src/lib/libc/port/threads/thread_interface.c =================================================================== ---- 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 +--- a/usr/src/lib/libc/port/threads/thread_interface.c ++++ b/usr/src/lib/libc/port/threads/thread_interface.c @@ -26,6 +26,7 @@ #include "lint.h" @@ -36,8 +36,8 @@ Index: b/usr/src/lib/libc/port/threads/thread_interface.c extern int _ti_bind_clear(); Index: b/usr/src/lib/libc/port/threads/tls.c =================================================================== ---- 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 +--- a/usr/src/lib/libc/port/threads/tls.c ++++ b/usr/src/lib/libc/port/threads/tls.c @@ -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 eb20ca0..ea82c94 100644 --- a/libc/debian/patches/unistd-add-environ.patch +++ b/libc/debian/patches/unistd-add-environ.patch @@ -1,8 +1,8 @@ Index: b/usr/src/head/unistd.h =================================================================== ---- 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 @@ +--- a/usr/src/head/unistd.h ++++ b/usr/src/head/unistd.h +@@ -34,7 +34,7 @@ #ifndef _UNISTD_H #define _UNISTD_H @@ -11,7 +11,7 @@ Index: b/usr/src/head/unistd.h #include <sys/types.h> #include <sys/unistd.h> -@@ -1129,6 +1129,9 @@ +@@ -729,6 +729,9 @@ extern int getentropy(void *, size_t); #endif /* __GNUC__ */ #endif diff --git a/libc/debian/patches/use-posix-functions.patch b/libc/debian/patches/use-posix-functions.patch index bc01a35..f6b8a8a 100644 --- a/libc/debian/patches/use-posix-functions.patch +++ b/libc/debian/patches/use-posix-functions.patch @@ -1,8 +1,8 @@ Description: Use POSIX by default -Index: libc/usr/src/head/pwd.h +Index: b/usr/src/head/pwd.h =================================================================== ---- libc.orig/usr/src/head/pwd.h -+++ libc/usr/src/head/pwd.h +--- a/usr/src/head/pwd.h ++++ b/usr/src/head/pwd.h @@ -119,10 +119,7 @@ extern void setpwent(void); * only. New applications/libraries should use the standard definitions. */ @@ -49,10 +49,10 @@ Index: libc/usr/src/head/pwd.h #ifdef __cplusplus } -Index: libc/usr/src/lib/libc/port/gen/getpwnam.c +Index: b/usr/src/lib/libc/port/gen/getpwnam.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/gen/getpwnam.c -+++ libc/usr/src/lib/libc/port/gen/getpwnam.c +--- a/usr/src/lib/libc/port/gen/getpwnam.c ++++ b/usr/src/lib/libc/port/gen/getpwnam.c @@ -32,6 +32,8 @@ #pragma weak _getpwnam = getpwnam #pragma weak _getpwuid = getpwuid @@ -62,10 +62,10 @@ Index: libc/usr/src/lib/libc/port/gen/getpwnam.c #include "lint.h" #include <sys/types.h> #include <pwd.h> -Index: libc/usr/src/lib/libc/port/gen/getpwnam_r.c +Index: b/usr/src/lib/libc/port/gen/getpwnam_r.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/gen/getpwnam_r.c -+++ libc/usr/src/lib/libc/port/gen/getpwnam_r.c +--- a/usr/src/lib/libc/port/gen/getpwnam_r.c ++++ b/usr/src/lib/libc/port/gen/getpwnam_r.c @@ -24,6 +24,8 @@ * Use is subject to license terms. */ @@ -75,10 +75,10 @@ Index: libc/usr/src/lib/libc/port/gen/getpwnam_r.c #include "lint.h" #include <sys/types.h> #include <pwd.h> -Index: libc/usr/src/head/grp.h +Index: b/usr/src/head/grp.h =================================================================== ---- libc.orig/usr/src/head/grp.h -+++ libc/usr/src/head/grp.h +--- a/usr/src/head/grp.h ++++ b/usr/src/head/grp.h @@ -110,10 +110,7 @@ extern struct group *getgrent(void); /* * only. New applications/libraries should use the standard definitions. */ @@ -125,10 +125,10 @@ Index: libc/usr/src/head/grp.h #ifdef __cplusplus } -Index: libc/usr/src/lib/libc/port/stdio/cuserid.c +Index: b/usr/src/lib/libc/port/stdio/cuserid.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/stdio/cuserid.c -+++ libc/usr/src/lib/libc/port/stdio/cuserid.c +--- a/usr/src/lib/libc/port/stdio/cuserid.c ++++ b/usr/src/lib/libc/port/stdio/cuserid.c @@ -31,6 +31,8 @@ #pragma weak _cuserid = cuserid @@ -138,10 +138,10 @@ Index: libc/usr/src/lib/libc/port/stdio/cuserid.c #include "lint.h" #include <stdio.h> #include <pwd.h> -Index: libc/usr/src/lib/libc/port/gen/getgrnam.c +Index: b/usr/src/lib/libc/port/gen/getgrnam.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/gen/getgrnam.c -+++ libc/usr/src/lib/libc/port/gen/getgrnam.c +--- a/usr/src/lib/libc/port/gen/getgrnam.c ++++ b/usr/src/lib/libc/port/gen/getgrnam.c @@ -32,6 +32,8 @@ #pragma weak _getgrnam = getgrnam #pragma weak _getgrgid = getgrgid @@ -151,10 +151,10 @@ Index: libc/usr/src/lib/libc/port/gen/getgrnam.c #include "lint.h" #include <sys/types.h> #include <grp.h> -Index: libc/usr/src/lib/libc/port/gen/getgrnam_r.c +Index: b/usr/src/lib/libc/port/gen/getgrnam_r.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/gen/getgrnam_r.c -+++ libc/usr/src/lib/libc/port/gen/getgrnam_r.c +--- a/usr/src/lib/libc/port/gen/getgrnam_r.c ++++ b/usr/src/lib/libc/port/gen/getgrnam_r.c @@ -24,6 +24,8 @@ * Use is subject to license terms. */ @@ -164,10 +164,10 @@ Index: libc/usr/src/lib/libc/port/gen/getgrnam_r.c #include "lint.h" #include <mtlib.h> #include <sys/types.h> -Index: libc/usr/src/lib/libnsl/rpc/netnamer.c +Index: b/usr/src/lib/libnsl/rpc/netnamer.c =================================================================== ---- libc.orig/usr/src/lib/libnsl/rpc/netnamer.c -+++ libc/usr/src/lib/libnsl/rpc/netnamer.c +--- a/usr/src/lib/libnsl/rpc/netnamer.c ++++ b/usr/src/lib/libnsl/rpc/netnamer.c @@ -49,6 +49,8 @@ */ @@ -177,10 +177,10 @@ Index: libc/usr/src/lib/libnsl/rpc/netnamer.c #include "mt.h" #include "rpc_mt.h" #include <stdio.h> -Index: libc/usr/src/lib/libsecdb/common/getexecattr.c +Index: b/usr/src/lib/libsecdb/common/getexecattr.c =================================================================== ---- libc.orig/usr/src/lib/libsecdb/common/getexecattr.c -+++ libc/usr/src/lib/libsecdb/common/getexecattr.c +--- a/usr/src/lib/libsecdb/common/getexecattr.c ++++ b/usr/src/lib/libsecdb/common/getexecattr.c @@ -22,6 +22,8 @@ * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. */ @@ -190,10 +190,10 @@ Index: libc/usr/src/lib/libsecdb/common/getexecattr.c #include <sys/types.h> #include <stdio.h> #include <string.h> -Index: libc/usr/src/lib/libsecdb/common/chkauthattr.c +Index: b/usr/src/lib/libsecdb/common/chkauthattr.c =================================================================== ---- libc.orig/usr/src/lib/libsecdb/common/chkauthattr.c -+++ libc/usr/src/lib/libsecdb/common/chkauthattr.c +--- a/usr/src/lib/libsecdb/common/chkauthattr.c ++++ b/usr/src/lib/libsecdb/common/chkauthattr.c @@ -22,6 +22,8 @@ * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. */ @@ -203,10 +203,10 @@ Index: libc/usr/src/lib/libsecdb/common/chkauthattr.c #include <alloca.h> #include <stdio.h> #include <stdlib.h> -Index: libc/usr/src/lib/libsecdb/common/getuserattr.c +Index: b/usr/src/lib/libsecdb/common/getuserattr.c =================================================================== ---- libc.orig/usr/src/lib/libsecdb/common/getuserattr.c -+++ libc/usr/src/lib/libsecdb/common/getuserattr.c +--- a/usr/src/lib/libsecdb/common/getuserattr.c ++++ b/usr/src/lib/libsecdb/common/getuserattr.c @@ -25,6 +25,8 @@ #pragma ident "%Z%%M% %I% %E% SMI" @@ -216,10 +216,10 @@ Index: libc/usr/src/lib/libsecdb/common/getuserattr.c #include <sys/types.h> #include <sys/mman.h> #include <stdio.h> -Index: libc/usr/src/head/signal.h +Index: b/usr/src/head/signal.h =================================================================== ---- libc.orig/usr/src/head/signal.h -+++ libc/usr/src/head/signal.h +--- a/usr/src/head/signal.h ++++ b/usr/src/head/signal.h @@ -140,11 +140,7 @@ extern int sigqueue(pid_t, int, const un * sigwait() prototype is defined here. */ @@ -262,10 +262,10 @@ Index: libc/usr/src/head/signal.h #ifdef __cplusplus } -Index: libc/usr/src/lib/nsswitch/nis/common/getgrent.c +Index: b/usr/src/lib/nsswitch/nis/common/getgrent.c =================================================================== ---- libc.orig/usr/src/lib/nsswitch/nis/common/getgrent.c -+++ libc/usr/src/lib/nsswitch/nis/common/getgrent.c +--- a/usr/src/lib/nsswitch/nis/common/getgrent.c ++++ b/usr/src/lib/nsswitch/nis/common/getgrent.c @@ -27,6 +27,8 @@ * nis/getgrent.c -- "nis" backend for nsswitch "group" database */ @@ -275,10 +275,10 @@ Index: libc/usr/src/lib/nsswitch/nis/common/getgrent.c #include <grp.h> #include <pwd.h> #include "nis_common.h" -Index: libc/usr/src/lib/libc/port/sys/posix_sigwait.c +Index: b/usr/src/lib/libc/port/sys/posix_sigwait.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/sys/posix_sigwait.c -+++ libc/usr/src/lib/libc/port/sys/posix_sigwait.c +--- a/usr/src/lib/libc/port/sys/posix_sigwait.c ++++ b/usr/src/lib/libc/port/sys/posix_sigwait.c @@ -26,6 +26,8 @@ #pragma ident "%Z%%M% %I% %E% SMI" @@ -288,10 +288,10 @@ Index: libc/usr/src/lib/libc/port/sys/posix_sigwait.c #include "lint.h" #include <sys/types.h> #include <errno.h> -Index: libc/usr/src/lib/libc/port/threads/scalls.c +Index: b/usr/src/lib/libc/port/threads/scalls.c =================================================================== ---- libc.orig/usr/src/lib/libc/port/threads/scalls.c -+++ libc/usr/src/lib/libc/port/threads/scalls.c +--- a/usr/src/lib/libc/port/threads/scalls.c ++++ b/usr/src/lib/libc/port/threads/scalls.c @@ -27,6 +27,8 @@ /* Copyright (c) 2013, OmniTI Computer Consulting, Inc. All rights reserved. */ diff --git a/libc/debian/patches/zic-enable-leapsecond.patch b/libc/debian/patches/zic-enable-leapsecond.patch index 2a8c4a0..6ea8cdd 100644 --- a/libc/debian/patches/zic-enable-leapsecond.patch +++ b/libc/debian/patches/zic-enable-leapsecond.patch @@ -1,7 +1,7 @@ -Index: libc/usr/src/cmd/zic/zic.c +Index: b/usr/src/cmd/zic/zic.c =================================================================== ---- libc.orig/usr/src/cmd/zic/zic.c -+++ libc/usr/src/cmd/zic/zic.c +--- a/usr/src/cmd/zic/zic.c ++++ b/usr/src/cmd/zic/zic.c @@ -6,9 +6,7 @@ static char elsieid[] = "@(#)zic.c 7.128.1"; diff --git a/libc/debian/patches/zic-gnu-make-workaround.patch b/libc/debian/patches/zic-gnu-make-workaround.patch index 828d2bd..4cad738 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 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 @@ +--- a/usr/src/cmd/zic/Makefile ++++ b/usr/src/cmd/zic/Makefile +@@ -94,7 +94,7 @@ clean: lint: lint_SRCS diff --git a/libc/debian/patches/zic-only-zic.patch b/libc/debian/patches/zic-only-zic.patch index 38e9212..ffb1cec 100644 --- a/libc/debian/patches/zic-only-zic.patch +++ b/libc/debian/patches/zic-only-zic.patch @@ -1,8 +1,8 @@ Index: b/usr/src/cmd/zic/Makefile =================================================================== ---- 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 @@ +--- a/usr/src/cmd/zic/Makefile ++++ b/usr/src/cmd/zic/Makefile +@@ -61,9 +61,7 @@ $(PROG): $(OBJS) $(LINK.c) $(OBJS) -o $@ $(LDLIBS) $(POST_PROCESS) |