diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2012-10-19 09:04:27 +0400 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2012-10-19 09:04:27 +0400 |
| commit | 51715c96b755bc336fa13384dc5620172453502c (patch) | |
| tree | d4a578dd29aaaa00f3108548f81e12f69a0c2e50 /libc | |
| parent | 11d47b7e824d44ee6fb9178e4e14c45cc54d113e (diff) | |
| download | illumos-packaging-51715c96b755bc336fa13384dc5620172453502c.tar.gz | |
Strip illumos-gate/ to ease importing patches
Diffstat (limited to 'libc')
54 files changed, 332 insertions, 332 deletions
diff --git a/libc/debian/libc-bin.manpages b/libc/debian/libc-bin.manpages index 0831405..6ffed96 100644 --- a/libc/debian/libc-bin.manpages +++ b/libc/debian/libc-bin.manpages @@ -1,17 +1,17 @@ -illumos-gate/usr/src/man/man1/crle.1 -illumos-gate/usr/src/man/man1/getconf.1 -illumos-gate/usr/src/man/man1/ld.so.1.1 -illumos-gate/usr/src/man/man1/ldd.1 -illumos-gate/usr/src/man/man1/locale.1 -illumos-gate/usr/src/man/man1/localedef.1 -illumos-gate/usr/src/man/man1m/getent.1m -illumos-gate/usr/src/man/man1m/rpcinfo.1m -illumos-gate/usr/src/man/man1m/zdump.1m -illumos-gate/usr/src/man/man1m/zic.1m -illumos-gate/usr/src/man/man4/crypt.conf.4 -illumos-gate/usr/src/man/man5/crypt_bsdbf.5 -illumos-gate/usr/src/man/man5/crypt_bsdmd5.5 -illumos-gate/usr/src/man/man5/crypt_sha256.5 -illumos-gate/usr/src/man/man5/crypt_sha512.5 -illumos-gate/usr/src/man/man5/crypt_sunmd5.5 -illumos-gate/usr/src/man/man5/crypt_unix.5 +usr/src/man/man1/crle.1 +usr/src/man/man1/getconf.1 +usr/src/man/man1/ld.so.1.1 +usr/src/man/man1/ldd.1 +usr/src/man/man1/locale.1 +usr/src/man/man1/localedef.1 +usr/src/man/man1m/getent.1m +usr/src/man/man1m/rpcinfo.1m +usr/src/man/man1m/zdump.1m +usr/src/man/man1m/zic.1m +usr/src/man/man4/crypt.conf.4 +usr/src/man/man5/crypt_bsdbf.5 +usr/src/man/man5/crypt_bsdmd5.5 +usr/src/man/man5/crypt_sha256.5 +usr/src/man/man5/crypt_sha512.5 +usr/src/man/man5/crypt_sunmd5.5 +usr/src/man/man5/crypt_unix.5 diff --git a/libc/debian/libc-dev-bin.manpages b/libc/debian/libc-dev-bin.manpages index 5980659..7300901 100644 --- a/libc/debian/libc-dev-bin.manpages +++ b/libc/debian/libc-dev-bin.manpages @@ -1,2 +1,2 @@ -illumos-gate/usr/src/man/man1/rpcgen.1 -illumos-gate/usr/src/man/man1/gencat.1 +usr/src/man/man1/rpcgen.1 +usr/src/man/man1/gencat.1 diff --git a/libc/debian/locales.install b/libc/debian/locales.install index 316db94..a80c968 100644 --- a/libc/debian/locales.install +++ b/libc/debian/locales.install @@ -1,5 +1,5 @@ -illumos-gate/usr/src/cmd/localedef/data/*.src /usr/share/i18n/locales/ -illumos-gate/usr/src/cmd/localedef/data/*.cm /usr/share/i18n/locales/ +usr/src/cmd/localedef/data/*.src /usr/share/i18n/locales/ +usr/src/cmd/localedef/data/*.cm /usr/share/i18n/locales/ debian/locale-gen /usr/sbin/ debian/update-locale /usr/sbin/ debian/SUPPORTED /usr/share/i18n/ diff --git a/libc/debian/patches/cc-and-as-disagree.patch b/libc/debian/patches/cc-and-as-disagree.patch index a741466..829ff66 100644 --- a/libc/debian/patches/cc-and-as-disagree.patch +++ b/libc/debian/patches/cc-and-as-disagree.patch @@ -2,10 +2,10 @@ Description: Use CFLAGS for .c -> .s translation. "as" always executed with --32 or --64, but our GCC generates 64-bit by default. -Index: b/illumos-gate/usr/src/lib/libc/i386/Makefile.com +Index: b/usr/src/lib/libc/i386/Makefile.com =================================================================== ---- a/illumos-gate/usr/src/lib/libc/i386/Makefile.com 2012-09-30 22:01:57.394396788 +0400 -+++ b/illumos-gate/usr/src/lib/libc/i386/Makefile.com 2012-09-30 22:04:17.501788889 +0400 +--- a/usr/src/lib/libc/i386/Makefile.com 2012-09-30 22:01:57.394396788 +0400 ++++ b/usr/src/lib/libc/i386/Makefile.com 2012-09-30 22:04:17.501788889 +0400 @@ -1247,7 +1247,7 @@ $(POST_PROCESS_A) diff --git a/libc/debian/patches/crypt-multiarch.patch b/libc/debian/patches/crypt-multiarch.patch index 9d1c619..77e4765 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/illumos-gate/usr/src/lib/libc/port/gen/crypt.c +Index: b/usr/src/lib/libc/port/gen/crypt.c =================================================================== ---- a/illumos-gate/usr/src/lib/libc/port/gen/crypt.c 2012-09-30 22:01:55.272179040 +0400 -+++ b/illumos-gate/usr/src/lib/libc/port/gen/crypt.c 2012-09-30 22:04:24.455038538 +0400 +--- a/usr/src/lib/libc/port/gen/crypt.c 2012-09-30 22:01:55.272179040 +0400 ++++ b/usr/src/lib/libc/port/gen/crypt.c 2012-09-30 22:04:24.455038538 +0400 @@ -61,13 +61,10 @@ #define CRYPT_CONFLINELENGTH 1024 @@ -42,10 +42,10 @@ Index: b/illumos-gate/usr/src/lib/libc/port/gen/crypt.c } return (ret); -Index: b/illumos-gate/usr/src/lib/libc/Makefile.targ +Index: b/usr/src/lib/libc/Makefile.targ =================================================================== ---- a/illumos-gate/usr/src/lib/libc/Makefile.targ 2012-09-30 22:04:22.662320295 +0400 -+++ b/illumos-gate/usr/src/lib/libc/Makefile.targ 2012-09-30 22:04:24.455373970 +0400 +--- a/usr/src/lib/libc/Makefile.targ 2012-09-30 22:04:22.662320295 +0400 ++++ b/usr/src/lib/libc/Makefile.targ 2012-09-30 22:04:24.455373970 +0400 @@ -294,3 +294,10 @@ $(POST_PROCESS_O) @@ -57,10 +57,10 @@ Index: b/illumos-gate/usr/src/lib/libc/Makefile.targ + +CFLAGS += $(CFLAGS_DEB_CRYPT) +CFLAGS64 += $(CFLAGS_DEB_CRYPT) -Index: b/illumos-gate/usr/src/lib/crypt_modules/Makefile.crypt_modules +Index: b/usr/src/lib/crypt_modules/Makefile.crypt_modules =================================================================== ---- a/illumos-gate/usr/src/lib/crypt_modules/Makefile.crypt_modules 2012-09-30 22:01:55.272091272 +0400 -+++ b/illumos-gate/usr/src/lib/crypt_modules/Makefile.crypt_modules 2012-09-30 22:04:24.455740216 +0400 +--- a/usr/src/lib/crypt_modules/Makefile.crypt_modules 2012-09-30 22:01:55.272091272 +0400 ++++ b/usr/src/lib/crypt_modules/Makefile.crypt_modules 2012-09-30 22:04:24.455740216 +0400 @@ -34,7 +34,7 @@ CFLAGS += $(CCVERBOSE) CPPFLAGS += -D_REENTRANT diff --git a/libc/debian/patches/force-ctfutils-for-assym.h.patch b/libc/debian/patches/force-ctfutils-for-assym.h.patch index 36e8f01..bd14327 100644 --- a/libc/debian/patches/force-ctfutils-for-assym.h.patch +++ b/libc/debian/patches/force-ctfutils-for-assym.h.patch @@ -1,7 +1,7 @@ -Index: b/illumos-gate/usr/src/Makefile.master +Index: b/usr/src/Makefile.master =================================================================== ---- a/illumos-gate/usr/src/Makefile.master 2012-09-30 22:01:55.954153012 +0400 -+++ b/illumos-gate/usr/src/Makefile.master 2012-09-30 22:04:22.128282625 +0400 +--- a/usr/src/Makefile.master 2012-09-30 22:01:55.954153012 +0400 ++++ b/usr/src/Makefile.master 2012-09-30 22:04:22.128282625 +0400 @@ -489,10 +489,10 @@ $(CALLSYMS) \ $(CDWARFSTR) diff --git a/libc/debian/patches/fork1.patch b/libc/debian/patches/fork1.patch index 3228afd..309d34f 100644 --- a/libc/debian/patches/fork1.patch +++ b/libc/debian/patches/fork1.patch @@ -1,9 +1,9 @@ Description: cc1: error: '_fork1' aliased to external symbol 'fork1' 'fork1' aliased to 'fork', so make '_fork1' aliased to 'fork' -Index: b/illumos-gate/usr/src/lib/libc/port/threads/scalls.c +Index: b/usr/src/lib/libc/port/threads/scalls.c =================================================================== ---- a/illumos-gate/usr/src/lib/libc/port/threads/scalls.c 2012-09-30 22:01:57.036814575 +0400 -+++ b/illumos-gate/usr/src/lib/libc/port/threads/scalls.c 2012-09-30 22:04:18.839897793 +0400 +--- a/usr/src/lib/libc/port/threads/scalls.c 2012-09-30 22:01:57.036814575 +0400 ++++ b/usr/src/lib/libc/port/threads/scalls.c 2012-09-30 22:04:18.839897793 +0400 @@ -79,7 +79,7 @@ /* * 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 d2fd047..7fc93ea 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/illumos-gate/usr/src/lib/libc/i386/inc/SYS.h +Index: b/usr/src/lib/libc/i386/inc/SYS.h =================================================================== ---- a/illumos-gate/usr/src/lib/libc/i386/inc/SYS.h 2012-09-30 22:01:57.162242716 +0400 -+++ b/illumos-gate/usr/src/lib/libc/i386/inc/SYS.h 2012-09-30 22:04:18.029233723 +0400 +--- a/usr/src/lib/libc/i386/inc/SYS.h 2012-09-30 22:01:57.162242716 +0400 ++++ b/usr/src/lib/libc/i386/inc/SYS.h 2012-09-30 22:04:18.029233723 +0400 @@ -64,7 +64,7 @@ #define __SYSCALLINT(name) \ @@ -79,10 +79,10 @@ Index: b/illumos-gate/usr/src/lib/libc/i386/inc/SYS.h /* * SYSCALL_NOERROR provides the most common system call sequence for those -Index: b/illumos-gate/usr/src/lib/libc/amd64/inc/SYS.h +Index: b/usr/src/lib/libc/amd64/inc/SYS.h =================================================================== ---- a/illumos-gate/usr/src/lib/libc/amd64/inc/SYS.h 2012-09-30 22:01:57.162112785 +0400 -+++ b/illumos-gate/usr/src/lib/libc/amd64/inc/SYS.h 2012-09-30 22:04:18.029722260 +0400 +--- a/usr/src/lib/libc/amd64/inc/SYS.h 2012-09-30 22:01:57.162112785 +0400 ++++ b/usr/src/lib/libc/amd64/inc/SYS.h 2012-09-30 22:04:18.029722260 +0400 @@ -54,7 +54,7 @@ #define __SYSCALL(name) \ movq %rcx, %r10; \ @@ -101,10 +101,10 @@ Index: b/illumos-gate/usr/src/lib/libc/amd64/inc/SYS.h int $T_FASTTRAP /* -Index: b/illumos-gate/usr/src/lib/libc/amd64/gen/memcmp.s +Index: b/usr/src/lib/libc/amd64/gen/memcmp.s =================================================================== ---- a/illumos-gate/usr/src/lib/libc/amd64/gen/memcmp.s 2012-09-30 22:01:57.162218724 +0400 -+++ b/illumos-gate/usr/src/lib/libc/amd64/gen/memcmp.s 2012-09-30 22:04:18.030203051 +0400 +--- a/usr/src/lib/libc/amd64/gen/memcmp.s 2012-09-30 22:01:57.162218724 +0400 ++++ b/usr/src/lib/libc/amd64/gen/memcmp.s 2012-09-30 22:04:18.030203051 +0400 @@ -54,7 +54,7 @@ #include "SYS.h" #include "cache.h" @@ -114,10 +114,10 @@ Index: b/illumos-gate/usr/src/lib/libc/amd64/gen/memcmp.s ENTRY(memcmp) /* (const void *, const void*, size_t) */ -Index: b/illumos-gate/usr/src/lib/libc/amd64/gen/memcpy.s +Index: b/usr/src/lib/libc/amd64/gen/memcpy.s =================================================================== ---- a/illumos-gate/usr/src/lib/libc/amd64/gen/memcpy.s 2012-09-30 22:01:57.162168084 +0400 -+++ b/illumos-gate/usr/src/lib/libc/amd64/gen/memcpy.s 2012-09-30 22:04:18.031273217 +0400 +--- a/usr/src/lib/libc/amd64/gen/memcpy.s 2012-09-30 22:01:57.162168084 +0400 ++++ b/usr/src/lib/libc/amd64/gen/memcpy.s 2012-09-30 22:04:18.031273217 +0400 @@ -44,7 +44,7 @@ #include "cache.h" #include "proc64_id.h" @@ -127,10 +127,10 @@ Index: b/illumos-gate/usr/src/lib/libc/amd64/gen/memcpy.s /* * memcpy algorithm overview: -Index: b/illumos-gate/usr/src/lib/libc/amd64/gen/memset.s +Index: b/usr/src/lib/libc/amd64/gen/memset.s =================================================================== ---- a/illumos-gate/usr/src/lib/libc/amd64/gen/memset.s 2012-09-30 22:01:57.162195235 +0400 -+++ b/illumos-gate/usr/src/lib/libc/amd64/gen/memset.s 2012-09-30 22:04:18.032628337 +0400 +--- a/usr/src/lib/libc/amd64/gen/memset.s 2012-09-30 22:01:57.162195235 +0400 ++++ b/usr/src/lib/libc/amd64/gen/memset.s 2012-09-30 22:04:18.032628337 +0400 @@ -42,7 +42,7 @@ #include "cache.h" #include "proc64_id.h" @@ -140,10 +140,10 @@ Index: b/illumos-gate/usr/src/lib/libc/amd64/gen/memset.s /* * memset algorithm overview: -Index: b/illumos-gate/usr/src/lib/libc/amd64/gen/strcmp.s +Index: b/usr/src/lib/libc/amd64/gen/strcmp.s =================================================================== ---- a/illumos-gate/usr/src/lib/libc/amd64/gen/strcmp.s 2012-09-30 22:01:57.162231700 +0400 -+++ b/illumos-gate/usr/src/lib/libc/amd64/gen/strcmp.s 2012-09-30 22:04:18.033273921 +0400 +--- a/usr/src/lib/libc/amd64/gen/strcmp.s 2012-09-30 22:01:57.162231700 +0400 ++++ b/usr/src/lib/libc/amd64/gen/strcmp.s 2012-09-30 22:04:18.033273921 +0400 @@ -31,7 +31,7 @@ #include "SYS.h" #include "proc64_id.h" @@ -153,10 +153,10 @@ Index: b/illumos-gate/usr/src/lib/libc/amd64/gen/strcmp.s #ifdef USE_AS_STRNCMP /* -Index: b/illumos-gate/usr/src/lib/libc/amd64/gen/strcpy.s +Index: b/usr/src/lib/libc/amd64/gen/strcpy.s =================================================================== ---- a/illumos-gate/usr/src/lib/libc/amd64/gen/strcpy.s 2012-09-30 22:01:57.162207265 +0400 -+++ b/illumos-gate/usr/src/lib/libc/amd64/gen/strcpy.s 2012-09-30 22:04:18.034113702 +0400 +--- a/usr/src/lib/libc/amd64/gen/strcpy.s 2012-09-30 22:01:57.162207265 +0400 ++++ b/usr/src/lib/libc/amd64/gen/strcpy.s 2012-09-30 22:04:18.034113702 +0400 @@ -30,7 +30,7 @@ #include "SYS.h" #include "proc64_id.h" @@ -166,10 +166,10 @@ Index: b/illumos-gate/usr/src/lib/libc/amd64/gen/strcpy.s #ifdef USE_AS_STRNCPY ENTRY(strncpy) -Index: b/illumos-gate/usr/src/lib/libc/amd64/gen/strlen.s +Index: b/usr/src/lib/libc/amd64/gen/strlen.s =================================================================== ---- a/illumos-gate/usr/src/lib/libc/amd64/gen/strlen.s 2012-09-30 22:01:57.162183925 +0400 -+++ b/illumos-gate/usr/src/lib/libc/amd64/gen/strlen.s 2012-09-30 22:04:18.034426792 +0400 +--- a/usr/src/lib/libc/amd64/gen/strlen.s 2012-09-30 22:01:57.162183925 +0400 ++++ b/usr/src/lib/libc/amd64/gen/strlen.s 2012-09-30 22:04:18.034426792 +0400 @@ -31,7 +31,7 @@ #include "SYS.h" #include "proc64_id.h" diff --git a/libc/debian/patches/getconf-no-xpg.patch b/libc/debian/patches/getconf-no-xpg.patch index 93302e7..fced5ca 100644 --- a/libc/debian/patches/getconf-no-xpg.patch +++ b/libc/debian/patches/getconf-no-xpg.patch @@ -1,7 +1,7 @@ -Index: b/illumos-gate/usr/src/cmd/getconf/Makefile +Index: b/usr/src/cmd/getconf/Makefile =================================================================== ---- a/illumos-gate/usr/src/cmd/getconf/Makefile 2012-09-30 22:01:52.352358148 +0400 -+++ b/illumos-gate/usr/src/cmd/getconf/Makefile 2012-09-30 22:04:35.946028080 +0400 +--- a/usr/src/cmd/getconf/Makefile 2012-09-30 22:01:52.352358148 +0400 ++++ b/usr/src/cmd/getconf/Makefile 2012-09-30 22:04:35.946028080 +0400 @@ -73,7 +73,7 @@ .KEEP_STATE: diff --git a/libc/debian/patches/getent-avoid-libproject.patch b/libc/debian/patches/getent-avoid-libproject.patch index 5dcb288..537c33c 100644 --- a/libc/debian/patches/getent-avoid-libproject.patch +++ b/libc/debian/patches/getent-avoid-libproject.patch @@ -1,7 +1,7 @@ -Index: b/illumos-gate/usr/src/cmd/getent/Makefile +Index: b/usr/src/cmd/getent/Makefile =================================================================== ---- a/illumos-gate/usr/src/cmd/getent/Makefile 2012-09-30 22:01:52.175966659 +0400 -+++ b/illumos-gate/usr/src/cmd/getent/Makefile 2012-09-30 22:04:36.484262935 +0400 +--- a/usr/src/cmd/getent/Makefile 2012-09-30 22:01:52.175966659 +0400 ++++ b/usr/src/cmd/getent/Makefile 2012-09-30 22:04:36.484262935 +0400 @@ -46,7 +46,7 @@ SRCS= $(OBJECTS:.o=.c) @@ -11,10 +11,10 @@ Index: b/illumos-gate/usr/src/cmd/getent/Makefile # # for message catalog -Index: b/illumos-gate/usr/src/cmd/getent/dogetproject.c +Index: b/usr/src/cmd/getent/dogetproject.c =================================================================== ---- a/illumos-gate/usr/src/cmd/getent/dogetproject.c 2012-09-30 22:01:52.175920550 +0400 -+++ b/illumos-gate/usr/src/cmd/getent/dogetproject.c 2012-09-30 22:04:36.484772353 +0400 +--- a/usr/src/cmd/getent/dogetproject.c 2012-09-30 22:01:52.175920550 +0400 ++++ b/usr/src/cmd/getent/dogetproject.c 2012-09-30 22:04:36.484772353 +0400 @@ -29,9 +29,226 @@ #include <stdio.h> #include <grp.h> diff --git a/libc/debian/patches/gnu-make-quirks.patch b/libc/debian/patches/gnu-make-quirks.patch index e34b701..df37424 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: b/illumos-gate/usr/src/lib/libc/Makefile.targ +Index: b/usr/src/lib/libc/Makefile.targ =================================================================== ---- a/illumos-gate/usr/src/lib/libc/Makefile.targ 2012-09-30 22:04:19.400419050 +0400 -+++ b/illumos-gate/usr/src/lib/libc/Makefile.targ 2012-09-30 22:04:22.662320295 +0400 +--- a/usr/src/lib/libc/Makefile.targ 2012-09-30 22:04:19.400419050 +0400 ++++ b/usr/src/lib/libc/Makefile.targ 2012-09-30 22:04:22.662320295 +0400 @@ -53,10 +53,6 @@ $(BUILD.s) $(POST_PROCESS_O) @@ -43,10 +43,10 @@ Index: b/illumos-gate/usr/src/lib/libc/Makefile.targ $(COMPILE.c) -o $@ $(SRC)/common/unicode/$(@F:.o=.c) $(POST_PROCESS_O) -Index: b/illumos-gate/usr/src/Makefile.msg.targ +Index: b/usr/src/Makefile.msg.targ =================================================================== ---- a/illumos-gate/usr/src/Makefile.msg.targ 2012-09-30 22:01:55.819692529 +0400 -+++ b/illumos-gate/usr/src/Makefile.msg.targ 2012-09-30 22:04:22.663327619 +0400 +--- a/usr/src/Makefile.msg.targ 2012-09-30 22:01:55.819692529 +0400 ++++ b/usr/src/Makefile.msg.targ 2012-09-30 22:04:22.663327619 +0400 @@ -33,7 +33,7 @@ .PARALLEL: $(POFILES) $(MSGFILES) @@ -56,10 +56,10 @@ Index: b/illumos-gate/usr/src/Makefile.msg.targ $(INS.dir) $(MSGDOMAINPOFILE): $(MSGDOMAIN) $(POFILE) -Index: b/illumos-gate/usr/src/lib/libc/i386/Makefile.com +Index: b/usr/src/lib/libc/i386/Makefile.com =================================================================== ---- a/illumos-gate/usr/src/lib/libc/i386/Makefile.com 2012-09-30 22:04:17.501788889 +0400 -+++ b/illumos-gate/usr/src/lib/libc/i386/Makefile.com 2012-09-30 22:04:22.664478667 +0400 +--- a/usr/src/lib/libc/i386/Makefile.com 2012-09-30 22:04:17.501788889 +0400 ++++ b/usr/src/lib/libc/i386/Makefile.com 2012-09-30 22:04:22.664478667 +0400 @@ -1289,5 +1289,9 @@ cd $(LIBCDIR)/port/gen; pwd; $(AWK) -f errlist.awk < errlist @@ -70,10 +70,10 @@ Index: b/illumos-gate/usr/src/lib/libc/i386/Makefile.com pics/new_list.o: $(LIBCDIR)/port/gen/new_list.c + $(COMPILE.c) -o $@ $< + $(POST_PROCESS_O) -Index: b/illumos-gate/usr/src/lib/libc/amd64/Makefile +Index: b/usr/src/lib/libc/amd64/Makefile =================================================================== ---- a/illumos-gate/usr/src/lib/libc/amd64/Makefile 2012-09-30 22:01:55.819856376 +0400 -+++ b/illumos-gate/usr/src/lib/libc/amd64/Makefile 2012-09-30 22:04:22.665085791 +0400 +--- a/usr/src/lib/libc/amd64/Makefile 2012-09-30 22:01:55.819856376 +0400 ++++ b/usr/src/lib/libc/amd64/Makefile 2012-09-30 22:04:22.665085791 +0400 @@ -1217,5 +1217,9 @@ cd $(LIBCDIR)/port/gen; pwd; $(AWK) -f errlist.awk < errlist diff --git a/libc/debian/patches/headers-limits.h-name-max.patch b/libc/debian/patches/headers-limits.h-name-max.patch index 3c47180..3e23b8c 100644 --- a/libc/debian/patches/headers-limits.h-name-max.patch +++ b/libc/debian/patches/headers-limits.h-name-max.patch @@ -1,7 +1,7 @@ -Index: libc/illumos-gate/usr/src/head/limits.h +Index: libc/usr/src/head/limits.h =================================================================== ---- libc.orig/illumos-gate/usr/src/head/limits.h 2012-09-30 20:41:17.000000000 +0400 -+++ libc/illumos-gate/usr/src/head/limits.h 2012-10-07 23:38:40.104532063 +0400 +--- libc.orig/usr/src/head/limits.h 2012-09-30 20:41:17.000000000 +0400 ++++ libc/usr/src/head/limits.h 2012-10-07 23:38:40.104532063 +0400 @@ -262,6 +262,8 @@ * #define NAME_MAX 14 */ @@ -11,10 +11,10 @@ Index: libc/illumos-gate/usr/src/head/limits.h #define CHILD_MAX 25 /* max # of processes per user id */ #ifndef OPEN_MAX #define OPEN_MAX 256 /* max # of files a process can have open */ -Index: libc/illumos-gate/usr/src/lib/libc/port/regex/glob.c +Index: libc/usr/src/lib/libc/port/regex/glob.c =================================================================== ---- libc.orig/illumos-gate/usr/src/lib/libc/port/regex/glob.c 2012-09-30 20:41:22.000000000 +0400 -+++ libc/illumos-gate/usr/src/lib/libc/port/regex/glob.c 2012-10-07 23:44:43.948613017 +0400 +--- libc.orig/usr/src/lib/libc/port/regex/glob.c 2012-09-30 20:41:22.000000000 +0400 ++++ libc/usr/src/lib/libc/port/regex/glob.c 2012-10-07 23:44:43.948613017 +0400 @@ -64,6 +64,7 @@ #define INITIAL 8 /* initial pathv allocation */ diff --git a/libc/debian/patches/illumos-2252-gettext.patch b/libc/debian/patches/illumos-2252-gettext.patch index 0bf6825..31aeeae 100644 --- a/libc/debian/patches/illumos-2252-gettext.patch +++ b/libc/debian/patches/illumos-2252-gettext.patch @@ -2,10 +2,10 @@ Description: gettext should search in several directories Search for message catalogs not only in locale dir (e. g. "ru_RU.UTF-8"), but also in "ru_RU" and "ru". Bug: https://www.illumos.org/issues/2252 -Index: b/illumos-gate/usr/src/lib/libc/port/i18n/gettext_util.c +Index: b/usr/src/lib/libc/port/i18n/gettext_util.c =================================================================== ---- a/illumos-gate/usr/src/lib/libc/port/i18n/gettext_util.c 2012-09-30 22:01:56.561076827 +0400 -+++ b/illumos-gate/usr/src/lib/libc/port/i18n/gettext_util.c 2012-09-30 22:04:20.006695081 +0400 +--- a/usr/src/lib/libc/port/i18n/gettext_util.c 2012-09-30 22:01:56.561076827 +0400 ++++ b/usr/src/lib/libc/port/i18n/gettext_util.c 2012-09-30 22:04:20.006695081 +0400 @@ -88,6 +88,8 @@ { char *p, *q; diff --git a/libc/debian/patches/illumos-2404-mmap.patch b/libc/debian/patches/illumos-2404-mmap.patch index 214d929..d324b3d 100644 --- a/libc/debian/patches/illumos-2404-mmap.patch +++ b/libc/debian/patches/illumos-2404-mmap.patch @@ -3,10 +3,10 @@ Description: split mmap.s into mmap.s and mmap64.s mmap.s for mmap64.o by default, but sunmake - mmap64.s (WTF?) Bug: https://www.illumos.org/issues/2404 -Index: b/illumos-gate/usr/src/lib/libc/common/sys/mmap.s +Index: b/usr/src/lib/libc/common/sys/mmap.s =================================================================== ---- a/illumos-gate/usr/src/lib/libc/common/sys/mmap.s 2012-09-30 22:01:56.837992713 +0400 -+++ b/illumos-gate/usr/src/lib/libc/common/sys/mmap.s 2012-09-30 22:04:19.399674119 +0400 +--- a/usr/src/lib/libc/common/sys/mmap.s 2012-09-30 22:01:56.837992713 +0400 ++++ b/usr/src/lib/libc/common/sys/mmap.s 2012-09-30 22:04:19.399674119 +0400 @@ -31,17 +31,11 @@ #include <sys/asm_linkage.h> @@ -50,10 +50,10 @@ Index: b/illumos-gate/usr/src/lib/libc/common/sys/mmap.s - SET_SIZE(mmap64) - -#endif -Index: b/illumos-gate/usr/src/lib/libc/common/sys/mmap64.s +Index: b/usr/src/lib/libc/common/sys/mmap64.s =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ b/illumos-gate/usr/src/lib/libc/common/sys/mmap64.s 2012-09-30 22:04:19.400039358 +0400 ++++ b/usr/src/lib/libc/common/sys/mmap64.s 2012-09-30 22:04:19.400039358 +0400 @@ -0,0 +1,56 @@ +/* + * CDDL HEADER START @@ -111,10 +111,10 @@ Index: b/illumos-gate/usr/src/lib/libc/common/sys/mmap64.s + RET + SET_SIZE(mmap64) + -Index: b/illumos-gate/usr/src/lib/libc/Makefile.targ +Index: b/usr/src/lib/libc/Makefile.targ =================================================================== ---- a/illumos-gate/usr/src/lib/libc/Makefile.targ 2012-09-30 22:01:56.837929047 +0400 -+++ b/illumos-gate/usr/src/lib/libc/Makefile.targ 2012-09-30 22:04:19.400419050 +0400 +--- a/usr/src/lib/libc/Makefile.targ 2012-09-30 22:01:56.837929047 +0400 ++++ b/usr/src/lib/libc/Makefile.targ 2012-09-30 22:04:19.400419050 +0400 @@ -103,6 +103,10 @@ # rules to build large file aware objects (xxx64.o from xxx.s or xxx.c) diff --git a/libc/debian/patches/illumos-3243-getent-shadow.patch b/libc/debian/patches/illumos-3243-getent-shadow.patch index 29942f7..11dd72f 100644 --- a/libc/debian/patches/illumos-3243-getent-shadow.patch +++ b/libc/debian/patches/illumos-3243-getent-shadow.patch @@ -1,10 +1,10 @@ Description: Add shadow support to getent(1) sudo package uses 'getent shadow root' Bug: https://www.illumos.org/issues/3243 -Index: libc/illumos-gate/usr/src/cmd/getent/getent.c +Index: libc/usr/src/cmd/getent/getent.c =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/getent/getent.c 2012-10-03 22:48:19.289675091 +0400 -+++ libc/illumos-gate/usr/src/cmd/getent/getent.c 2012-10-03 22:48:54.412674705 +0400 +--- libc.orig/usr/src/cmd/getent/getent.c 2012-10-03 22:48:19.289675091 +0400 ++++ libc/usr/src/cmd/getent/getent.c 2012-10-03 22:48:54.412674705 +0400 @@ -42,6 +42,7 @@ static struct table t[] = { @@ -13,10 +13,10 @@ Index: libc/illumos-gate/usr/src/cmd/getent/getent.c { "group", dogetgr }, { "hosts", dogethost }, { "ipnodes", dogetipnodes }, -Index: libc/illumos-gate/usr/src/cmd/getent/Makefile +Index: libc/usr/src/cmd/getent/Makefile =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/getent/Makefile 2012-10-03 22:48:54.311948358 +0400 -+++ libc/illumos-gate/usr/src/cmd/getent/Makefile 2012-10-03 22:48:54.413606711 +0400 +--- libc.orig/usr/src/cmd/getent/Makefile 2012-10-03 22:48:54.311948358 +0400 ++++ libc/usr/src/cmd/getent/Makefile 2012-10-03 22:48:54.413606711 +0400 @@ -41,6 +41,7 @@ dogetproject.o \ dogetproto.o \ @@ -25,10 +25,10 @@ Index: libc/illumos-gate/usr/src/cmd/getent/Makefile dogetserv.o \ getent.o -Index: libc/illumos-gate/usr/src/cmd/getent/dogetsp.c +Index: libc/usr/src/cmd/getent/dogetsp.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ libc/illumos-gate/usr/src/cmd/getent/dogetsp.c 2012-10-04 10:51:49.024584484 +0400 ++++ libc/usr/src/cmd/getent/dogetsp.c 2012-10-04 10:51:49.024584484 +0400 @@ -0,0 +1,62 @@ +/* + * CDDL HEADER START @@ -92,10 +92,10 @@ Index: libc/illumos-gate/usr/src/cmd/getent/dogetsp.c + + return (rc); +} -Index: libc/illumos-gate/usr/src/cmd/getent/getent.h +Index: libc/usr/src/cmd/getent/getent.h =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/getent/getent.h 2012-10-03 22:48:19.289736256 +0400 -+++ libc/illumos-gate/usr/src/cmd/getent/getent.h 2012-10-03 22:48:54.415441373 +0400 +--- libc.orig/usr/src/cmd/getent/getent.h 2012-10-03 22:48:19.289736256 +0400 ++++ libc/usr/src/cmd/getent/getent.h 2012-10-03 22:48:54.415441373 +0400 @@ -42,6 +42,7 @@ #define EXC_ENUM_NOT_SUPPORTED 3 @@ -104,10 +104,10 @@ Index: libc/illumos-gate/usr/src/cmd/getent/getent.h extern int dogetgr(const char **); extern int dogethost(const char **); extern int dogetipnodes(const char **); -Index: libc/illumos-gate/usr/src/man/man1m/getent.1m +Index: libc/usr/src/man/man1m/getent.1m =================================================================== ---- libc.orig/illumos-gate/usr/src/man/man1m/getent.1m 2012-09-30 20:41:28.000000000 +0400 -+++ libc/illumos-gate/usr/src/man/man1m/getent.1m 2012-10-04 00:55:38.283472015 +0400 +--- libc.orig/usr/src/man/man1m/getent.1m 2012-09-30 20:41:28.000000000 +0400 ++++ libc/usr/src/man/man1m/getent.1m 2012-10-04 00:55:38.283472015 +0400 @@ -21,10 +21,10 @@ .sp .LP diff --git a/libc/debian/patches/illumos-3244-ret_val-uninitialized.patch b/libc/debian/patches/illumos-3244-ret_val-uninitialized.patch index 4abc19e..bfad35c 100644 --- a/libc/debian/patches/illumos-3244-ret_val-uninitialized.patch +++ b/libc/debian/patches/illumos-3244-ret_val-uninitialized.patch @@ -3,10 +3,10 @@ Description: 'ret_val' may be used uninitialized utmpd.c:406:5: error: 'ret_val' may be used uninitialized in this function [-Werror=uninitialized] Bug: https://www.illumos.org/issues/3244 -Index: libc/illumos-gate/usr/src/cmd/utmpd/utmpd.c +Index: libc/usr/src/cmd/utmpd/utmpd.c =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/utmpd/utmpd.c 2012-09-30 22:27:59.525272136 +0400 -+++ libc/illumos-gate/usr/src/cmd/utmpd/utmpd.c 2012-09-30 22:29:01.560180335 +0400 +--- libc.orig/usr/src/cmd/utmpd/utmpd.c 2012-09-30 22:27:59.525272136 +0400 ++++ libc/usr/src/cmd/utmpd/utmpd.c 2012-09-30 22:29:01.560180335 +0400 @@ -351,7 +351,7 @@ register struct pollfd *pfd; register int i; diff --git a/libc/debian/patches/illumos-3253-tsol-workaround.patch b/libc/debian/patches/illumos-3253-tsol-workaround.patch index 9e32ac7..b9ef7fc 100644 --- a/libc/debian/patches/illumos-3253-tsol-workaround.patch +++ b/libc/debian/patches/illumos-3253-tsol-workaround.patch @@ -1,9 +1,9 @@ Description: <tsol/label.h> is not actually needed Bug: https://www.illumos.org/issues/3253 -Index: libc/illumos-gate/usr/src/lib/libc/port/gen/ucred.c +Index: libc/usr/src/lib/libc/port/gen/ucred.c =================================================================== ---- libc.orig/illumos-gate/usr/src/lib/libc/port/gen/ucred.c 2012-09-30 20:41:22.000000000 +0400 -+++ libc/illumos-gate/usr/src/lib/libc/port/gen/ucred.c 2012-10-03 22:43:39.610855793 +0400 +--- libc.orig/usr/src/lib/libc/port/gen/ucred.c 2012-09-30 20:41:22.000000000 +0400 ++++ libc/usr/src/lib/libc/port/gen/ucred.c 2012-10-03 22:43:39.610855793 +0400 @@ -66,7 +66,10 @@ #include <sys/procfs.h> #include <sys/sysmacros.h> @@ -16,10 +16,10 @@ Index: libc/illumos-gate/usr/src/lib/libc/port/gen/ucred.c ucred_t * _ucred_alloc(void) -Index: libc/illumos-gate/usr/src/head/zone.h +Index: libc/usr/src/head/zone.h =================================================================== ---- libc.orig/illumos-gate/usr/src/head/zone.h 2012-09-30 20:41:17.000000000 +0400 -+++ libc/illumos-gate/usr/src/head/zone.h 2012-10-03 22:48:45.162400433 +0400 +--- libc.orig/usr/src/head/zone.h 2012-09-30 20:41:17.000000000 +0400 ++++ libc/usr/src/head/zone.h 2012-10-03 22:48:45.162400433 +0400 @@ -29,7 +29,7 @@ #include <sys/types.h> #include <sys/zone.h> @@ -29,10 +29,10 @@ Index: libc/illumos-gate/usr/src/head/zone.h #ifdef __cplusplus extern "C" { -Index: libc/illumos-gate/usr/src/lib/libnsl/rpc/svc_generic.c +Index: libc/usr/src/lib/libnsl/rpc/svc_generic.c =================================================================== ---- libc.orig/illumos-gate/usr/src/lib/libnsl/rpc/svc_generic.c 2012-09-30 20:41:24.000000000 +0400 -+++ libc/illumos-gate/usr/src/lib/libnsl/rpc/svc_generic.c 2012-10-03 23:06:53.883069004 +0400 +--- libc.orig/usr/src/lib/libnsl/rpc/svc_generic.c 2012-09-30 20:41:24.000000000 +0400 ++++ libc/usr/src/lib/libnsl/rpc/svc_generic.c 2012-10-03 23:06:53.883069004 +0400 @@ -48,7 +48,7 @@ #include <malloc.h> #include <string.h> @@ -42,10 +42,10 @@ Index: libc/illumos-gate/usr/src/lib/libnsl/rpc/svc_generic.c #include <nfs/nfs.h> #include <nfs/nfs_acl.h> #include <rpcsvc/mount.h> -Index: libc/illumos-gate/usr/src/lib/libnsl/rpc/ti_opts.c +Index: libc/usr/src/lib/libnsl/rpc/ti_opts.c =================================================================== ---- libc.orig/illumos-gate/usr/src/lib/libnsl/rpc/ti_opts.c 2012-09-30 20:41:24.000000000 +0400 -+++ libc/illumos-gate/usr/src/lib/libnsl/rpc/ti_opts.c 2012-10-03 23:08:25.301792119 +0400 +--- libc.orig/usr/src/lib/libnsl/rpc/ti_opts.c 2012-09-30 20:41:24.000000000 +0400 ++++ libc/usr/src/lib/libnsl/rpc/ti_opts.c 2012-10-03 23:08:25.301792119 +0400 @@ -58,7 +58,7 @@ #include <alloca.h> #include <stdlib.h> diff --git a/libc/debian/patches/libc-filter.patch b/libc/debian/patches/libc-filter.patch index 36c6368..8f9b73a 100644 --- a/libc/debian/patches/libc-filter.patch +++ b/libc/debian/patches/libc-filter.patch @@ -1,7 +1,7 @@ -Index: b/illumos-gate/usr/src/lib/libc/port/mapfile-vers +Index: b/usr/src/lib/libc/port/mapfile-vers =================================================================== ---- a/illumos-gate/usr/src/lib/libc/port/mapfile-vers 2012-09-30 22:01:53.161890010 +0400 -+++ b/illumos-gate/usr/src/lib/libc/port/mapfile-vers 2012-09-30 22:04:33.005580114 +0400 +--- a/usr/src/lib/libc/port/mapfile-vers 2012-09-30 22:01:53.161890010 +0400 ++++ b/usr/src/lib/libc/port/mapfile-vers 2012-09-30 22:04:33.005580114 +0400 @@ -111,11 +111,11 @@ _nl_msg_cat_cntr; diff --git a/libc/debian/patches/libcrypt-makefile.patch b/libc/debian/patches/libcrypt-makefile.patch index 8ed3e5b..d261b06 100644 --- a/libc/debian/patches/libcrypt-makefile.patch +++ b/libc/debian/patches/libcrypt-makefile.patch @@ -1,9 +1,9 @@ Description: remove unneded tweaks GNU make concerns about malformed target-specific variable definition -Index: b/illumos-gate/usr/src/lib/libcrypt/Makefile.com +Index: b/usr/src/lib/libcrypt/Makefile.com =================================================================== ---- a/illumos-gate/usr/src/lib/libcrypt/Makefile.com 2012-09-30 22:01:55.399790758 +0400 -+++ b/illumos-gate/usr/src/lib/libcrypt/Makefile.com 2012-09-30 22:04:23.865745580 +0400 +--- a/usr/src/lib/libcrypt/Makefile.com 2012-09-30 22:01:55.399790758 +0400 ++++ b/usr/src/lib/libcrypt/Makefile.com 2012-09-30 22:04:23.865745580 +0400 @@ -57,24 +57,4 @@ include ../../Makefile.targ diff --git a/libc/debian/patches/libnsl-cxx-wtf.patch b/libc/debian/patches/libnsl-cxx-wtf.patch index 5413aea..755e310 100644 --- a/libc/debian/patches/libnsl-cxx-wtf.patch +++ b/libc/debian/patches/libnsl-cxx-wtf.patch @@ -1,9 +1,9 @@ Description: GNU make tries to compile nis_clnt.h via c++ C++ here is nonsense. -Index: b/illumos-gate/usr/src/lib/libnsl/Makefile.com +Index: b/usr/src/lib/libnsl/Makefile.com =================================================================== ---- a/illumos-gate/usr/src/lib/libnsl/Makefile.com 2012-09-30 22:01:55.516120272 +0400 -+++ b/illumos-gate/usr/src/lib/libnsl/Makefile.com 2012-09-30 22:04:23.325266961 +0400 +--- a/usr/src/lib/libnsl/Makefile.com 2012-09-30 22:01:55.516120272 +0400 ++++ b/usr/src/lib/libnsl/Makefile.com 2012-09-30 22:04:23.325266961 +0400 @@ -154,10 +154,6 @@ $(POST_PROCESS_O) diff --git a/libc/debian/patches/libnsl-gnu-make.patch b/libc/debian/patches/libnsl-gnu-make.patch index e1232ad..3e477b3 100644 --- a/libc/debian/patches/libnsl-gnu-make.patch +++ b/libc/debian/patches/libnsl-gnu-make.patch @@ -2,10 +2,10 @@ Description: fixing installing into proto (debian/tmp) This is a dirty hack. Without it 'make install' forget to walk into subdirs (i386 and amd64) and libnsl is not installed into debian/tmp -Index: libc/illumos-gate/usr/src/lib/libnsl/Makefile +Index: libc/usr/src/lib/libnsl/Makefile =================================================================== ---- libc.orig/illumos-gate/usr/src/lib/libnsl/Makefile 2012-10-08 04:25:41.000000000 +0400 -+++ libc/illumos-gate/usr/src/lib/libnsl/Makefile 2012-10-14 02:44:22.021506234 +0400 +--- libc.orig/usr/src/lib/libnsl/Makefile 2012-10-08 04:25:41.000000000 +0400 ++++ libc/usr/src/lib/libnsl/Makefile 2012-10-14 02:44:22.021506234 +0400 @@ -85,7 +85,7 @@ headers: $(PROTOCOL_DIR) .WAIT $(PROTOCOL_FILES) $(PROTOCOL_FILES_UTS) \ $(DERIVED_FILES) diff --git a/libc/debian/patches/libnsl-ipsec_proto_t.patch b/libc/debian/patches/libnsl-ipsec_proto_t.patch index 59a3946..ec793a4 100644 --- a/libc/debian/patches/libnsl-ipsec_proto_t.patch +++ b/libc/debian/patches/libnsl-ipsec_proto_t.patch @@ -9,10 +9,10 @@ Description: avoid ipsec_util.h dependency 1. system definitions 2. libipsecutil hell Bug: https://www.illumos.org/issues/3176 -Index: b/illumos-gate/usr/src/lib/libnsl/ipsec/algs.c +Index: b/usr/src/lib/libnsl/ipsec/algs.c =================================================================== ---- a/illumos-gate/usr/src/lib/libnsl/ipsec/algs.c 2012-09-30 22:01:53.278951312 +0400 -+++ b/illumos-gate/usr/src/lib/libnsl/ipsec/algs.c 2012-09-30 22:04:32.415801562 +0400 +--- a/usr/src/lib/libnsl/ipsec/algs.c 2012-09-30 22:01:53.278951312 +0400 ++++ b/usr/src/lib/libnsl/ipsec/algs.c 2012-09-30 22:04:32.415801562 +0400 @@ -28,7 +28,6 @@ #include <sys/types.h> #include <sys/errno.h> diff --git a/libc/debian/patches/libsecdb-only-lib.patch b/libc/debian/patches/libsecdb-only-lib.patch index 68b81e1..31ff521 100644 --- a/libc/debian/patches/libsecdb-only-lib.patch +++ b/libc/debian/patches/libsecdb-only-lib.patch @@ -1,7 +1,7 @@ -Index: b/illumos-gate/usr/src/lib/libsecdb/Makefile +Index: b/usr/src/lib/libsecdb/Makefile =================================================================== ---- a/illumos-gate/usr/src/lib/libsecdb/Makefile 2012-09-30 22:01:53.397905287 +0400 -+++ b/illumos-gate/usr/src/lib/libsecdb/Makefile 2012-09-30 22:04:31.794820100 +0400 +--- a/usr/src/lib/libsecdb/Makefile 2012-09-30 22:01:53.397905287 +0400 ++++ b/usr/src/lib/libsecdb/Makefile 2012-09-30 22:04:31.794820100 +0400 @@ -75,12 +75,6 @@ all clean clobber delete install lint package: $(SUBDIRS) _msg: $(MSGSUBDIRS) diff --git a/libc/debian/patches/localedef-bison.patch b/libc/debian/patches/localedef-bison.patch index 88278b1..684d5e1 100644 --- a/libc/debian/patches/localedef-bison.patch +++ b/libc/debian/patches/localedef-bison.patch @@ -1,10 +1,10 @@ Descriptions: 1. yylex() - implicit declaration 2. yydebug() - undefined at link time (fixed with -t) -Index: libc/illumos-gate/usr/src/cmd/localedef/Makefile +Index: libc/usr/src/cmd/localedef/Makefile =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/localedef/Makefile 2012-09-30 20:41:11.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/localedef/Makefile 2012-10-07 12:43:54.339619150 +0400 +--- libc.orig/usr/src/cmd/localedef/Makefile 2012-09-30 20:41:11.000000000 +0400 ++++ libc/usr/src/cmd/localedef/Makefile 2012-10-07 12:43:54.339619150 +0400 @@ -29,9 +29,10 @@ CERRWARN += -_gcc=-Wno-char-subscripts CERRWARN += -_gcc=-Wno-uninitialized diff --git a/libc/debian/patches/localedef-only.patch b/libc/debian/patches/localedef-only.patch index 86e55a1..806de9e 100644 --- a/libc/debian/patches/localedef-only.patch +++ b/libc/debian/patches/localedef-only.patch @@ -1,8 +1,8 @@ Description: only build localedef, we treat data specially. -Index: libc/illumos-gate/usr/src/cmd/localedef/Makefile +Index: libc/usr/src/cmd/localedef/Makefile =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/localedef/Makefile 2012-10-02 02:48:17.184524105 +0400 -+++ libc/illumos-gate/usr/src/cmd/localedef/Makefile 2012-10-02 02:56:51.937247303 +0400 +--- libc.orig/usr/src/cmd/localedef/Makefile 2012-10-02 02:48:17.184524105 +0400 ++++ libc/usr/src/cmd/localedef/Makefile 2012-10-02 02:56:51.937247303 +0400 @@ -229,9 +229,9 @@ $(ROOTDATA) := FILEMODE=0444 diff --git a/libc/debian/patches/no-hwcap.patch b/libc/debian/patches/no-hwcap.patch index ef5fb1a..6a3bebc 100644 --- a/libc/debian/patches/no-hwcap.patch +++ b/libc/debian/patches/no-hwcap.patch @@ -1,8 +1,8 @@ Description: do not build and install special version of libc -Index: b/illumos-gate/usr/src/lib/libc/Makefile +Index: b/usr/src/lib/libc/Makefile =================================================================== ---- a/illumos-gate/usr/src/lib/libc/Makefile 2012-09-30 22:04:21.054036416 +0400 -+++ b/illumos-gate/usr/src/lib/libc/Makefile 2012-09-30 22:04:21.561846261 +0400 +--- a/usr/src/lib/libc/Makefile 2012-09-30 22:04:21.054036416 +0400 ++++ b/usr/src/lib/libc/Makefile 2012-09-30 22:04:21.561846261 +0400 @@ -73,7 +73,7 @@ VAR1_DYNLIB64 = $(LIBRARY:%.a=%_$(VAR1).so$(VERS)) VAR1_BLDDIR64 = $(MACH)_$(VAR1)/$(VARBLD64) diff --git a/libc/debian/patches/no-lint.patch b/libc/debian/patches/no-lint.patch index ac3f697..9e010e9 100644 --- a/libc/debian/patches/no-lint.patch +++ b/libc/debian/patches/no-lint.patch @@ -1,7 +1,7 @@ -Index: b/illumos-gate/usr/src/lib/libc/Makefile +Index: b/usr/src/lib/libc/Makefile =================================================================== ---- a/illumos-gate/usr/src/lib/libc/Makefile 2012-09-30 22:01:56.325784168 +0400 -+++ b/illumos-gate/usr/src/lib/libc/Makefile 2012-09-30 22:04:21.054036416 +0400 +--- a/usr/src/lib/libc/Makefile 2012-09-30 22:01:56.325784168 +0400 ++++ b/usr/src/lib/libc/Makefile 2012-09-30 22:04:21.054036416 +0400 @@ -169,12 +169,10 @@ inslib32 \ $(BUILD64) inslib64 diff --git a/libc/debian/patches/no-lvm.patch b/libc/debian/patches/no-lvm.patch index 27ef2e7..187946d 100644 --- a/libc/debian/patches/no-lvm.patch +++ b/libc/debian/patches/no-lvm.patch @@ -1,7 +1,7 @@ -Index: b/illumos-gate/usr/src/head/Makefile +Index: b/usr/src/head/Makefile =================================================================== ---- a/illumos-gate/usr/src/head/Makefile 2012-09-30 22:01:57.517971003 +0400 -+++ b/illumos-gate/usr/src/head/Makefile 2012-09-30 22:04:16.565510958 +0400 +--- a/usr/src/head/Makefile 2012-09-30 22:01:57.517971003 +0400 ++++ b/usr/src/head/Makefile 2012-09-30 22:04:16.565510958 +0400 @@ -273,8 +273,6 @@ ufs_prot.h \ nfs_acl.h diff --git a/libc/debian/patches/nss-files-avoid-libtsnet.patch b/libc/debian/patches/nss-files-avoid-libtsnet.patch index be351d0..86db337 100644 --- a/libc/debian/patches/nss-files-avoid-libtsnet.patch +++ b/libc/debian/patches/nss-files-avoid-libtsnet.patch @@ -1,8 +1,8 @@ Description: we need only path! -Index: libc/illumos-gate/usr/src/lib/nsswitch/files/common/tsol_getrhent.c +Index: libc/usr/src/lib/nsswitch/files/common/tsol_getrhent.c =================================================================== ---- libc.orig/illumos-gate/usr/src/lib/nsswitch/files/common/tsol_getrhent.c 2012-09-30 20:41:27.000000000 +0400 -+++ libc/illumos-gate/usr/src/lib/nsswitch/files/common/tsol_getrhent.c 2012-10-03 23:31:30.562664652 +0400 +--- libc.orig/usr/src/lib/nsswitch/files/common/tsol_getrhent.c 2012-09-30 20:41:27.000000000 +0400 ++++ libc/usr/src/lib/nsswitch/files/common/tsol_getrhent.c 2012-10-03 23:31:30.562664652 +0400 @@ -27,7 +27,7 @@ #include "files_common.h" diff --git a/libc/debian/patches/objects-path.patch b/libc/debian/patches/objects-path.patch index 4dd9c56..5d6c8de 100644 --- a/libc/debian/patches/objects-path.patch +++ b/libc/debian/patches/objects-path.patch @@ -1,7 +1,7 @@ -Index: libc/illumos-gate/usr/src/lib/common/Makefile.com +Index: libc/usr/src/lib/common/Makefile.com =================================================================== ---- libc.orig/illumos-gate/usr/src/lib/common/Makefile.com 2012-09-30 20:41:17.000000000 +0400 -+++ libc/illumos-gate/usr/src/lib/common/Makefile.com 2012-10-07 22:21:34.026267746 +0400 +--- libc.orig/usr/src/lib/common/Makefile.com 2012-09-30 20:41:17.000000000 +0400 ++++ libc/usr/src/lib/common/Makefile.com 2012-10-07 22:21:34.026267746 +0400 @@ -40,8 +40,8 @@ OBJECTS = $(VALUES) $(CRTI) $(CRTN) $(INTEL_BLD)OBJECTS += $(CRT1) $(GCRT1) diff --git a/libc/debian/patches/perl-path.patch b/libc/debian/patches/perl-path.patch index edb79bd..f57c5e6 100644 --- a/libc/debian/patches/perl-path.patch +++ b/libc/debian/patches/perl-path.patch @@ -1,7 +1,7 @@ -Index: b/illumos-gate/usr/src/lib/libc/extract-copyright.pl +Index: b/usr/src/lib/libc/extract-copyright.pl =================================================================== ---- a/illumos-gate/usr/src/lib/libc/extract-copyright.pl 2012-09-30 22:01:56.439454147 +0400 -+++ b/illumos-gate/usr/src/lib/libc/extract-copyright.pl 2012-09-30 22:04:20.543591513 +0400 +--- a/usr/src/lib/libc/extract-copyright.pl 2012-09-30 22:01:56.439454147 +0400 ++++ b/usr/src/lib/libc/extract-copyright.pl 2012-09-30 22:04:20.543591513 +0400 @@ -1,4 +1,4 @@ -#! /usr/perl5/bin/perl +#!/usr/bin/perl diff --git a/libc/debian/patches/rename-libavl.patch b/libc/debian/patches/rename-libavl.patch index 2ca59a7..b090efe 100644 --- a/libc/debian/patches/rename-libavl.patch +++ b/libc/debian/patches/rename-libavl.patch @@ -9,10 +9,10 @@ Description: There are too many AVL tree libraries . Also note, kernel AVL headers are still here under /usr/include/sys/ and used by other kernel headers. -Index: libc/illumos-gate/usr/src/lib/libavl/Makefile.com +Index: libc/usr/src/lib/libavl/Makefile.com =================================================================== ---- libc.orig/illumos-gate/usr/src/lib/libavl/Makefile.com 2012-10-08 04:25:38.000000000 +0400 -+++ libc/illumos-gate/usr/src/lib/libavl/Makefile.com 2012-10-19 04:33:57.657549526 +0400 +--- libc.orig/usr/src/lib/libavl/Makefile.com 2012-10-08 04:25:38.000000000 +0400 ++++ libc/usr/src/lib/libavl/Makefile.com 2012-10-19 04:33:57.657549526 +0400 @@ -25,7 +25,7 @@ # ident "%Z%%M% %I% %E% SMI" # @@ -22,10 +22,10 @@ Index: libc/illumos-gate/usr/src/lib/libavl/Makefile.com VERS= .1 OBJECTS= avl.o -Index: libc/illumos-gate/usr/src/uts/common/sys/avl.h +Index: libc/usr/src/uts/common/sys/avl.h =================================================================== ---- libc.orig/illumos-gate/usr/src/uts/common/sys/avl.h 2012-10-08 04:25:58.000000000 +0400 -+++ libc/illumos-gate/usr/src/uts/common/sys/avl.h 2012-10-19 04:33:57.659147581 +0400 +--- libc.orig/usr/src/uts/common/sys/avl.h 2012-10-08 04:25:58.000000000 +0400 ++++ libc/usr/src/uts/common/sys/avl.h 2012-10-19 04:33:57.659147581 +0400 @@ -36,7 +36,7 @@ #endif @@ -35,10 +35,10 @@ Index: libc/illumos-gate/usr/src/uts/common/sys/avl.h /* * This is a generic implemenatation of AVL trees for use in the Solaris kernel. -Index: libc/illumos-gate/usr/src/cmd/sgs/include/_string_table.h +Index: libc/usr/src/cmd/sgs/include/_string_table.h =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/include/_string_table.h 2012-10-08 04:25:33.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/include/_string_table.h 2012-10-19 04:33:57.660651297 +0400 +--- libc.orig/usr/src/cmd/sgs/include/_string_table.h 2012-10-08 04:25:33.000000000 +0400 ++++ libc/usr/src/cmd/sgs/include/_string_table.h 2012-10-19 04:33:57.660651297 +0400 @@ -29,7 +29,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" @@ -48,10 +48,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/include/_string_table.h #include <string_table.h> #ifdef __cplusplus -Index: libc/illumos-gate/usr/src/cmd/sgs/include/libld.h +Index: libc/usr/src/cmd/sgs/include/libld.h =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/include/libld.h 2012-10-08 04:25:33.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/include/libld.h 2012-10-19 04:33:57.663132492 +0400 +--- libc.orig/usr/src/cmd/sgs/include/libld.h 2012-10-08 04:25:33.000000000 +0400 ++++ libc/usr/src/cmd/sgs/include/libld.h 2012-10-19 04:33:57.663132492 +0400 @@ -34,7 +34,7 @@ #include <sgs.h> #include <_machelf.h> @@ -61,10 +61,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/include/libld.h #include <alist.h> #include <elfcap.h> -Index: libc/illumos-gate/usr/src/cmd/sgs/include/rtld.h +Index: libc/usr/src/cmd/sgs/include/rtld.h =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/include/rtld.h 2012-10-08 04:25:33.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/include/rtld.h 2012-10-19 04:33:57.664609694 +0400 +--- libc.orig/usr/src/cmd/sgs/include/rtld.h 2012-10-08 04:25:33.000000000 +0400 ++++ libc/usr/src/cmd/sgs/include/rtld.h 2012-10-19 04:33:57.664609694 +0400 @@ -34,7 +34,7 @@ #include <thread.h> #include <synch.h> @@ -74,10 +74,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/include/rtld.h #include <alist.h> #include <libc_int.h> #include <elfcap.h> -Index: libc/illumos-gate/usr/src/cmd/sgs/rtld/common/_rtld.h +Index: libc/usr/src/cmd/sgs/rtld/common/_rtld.h =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/rtld/common/_rtld.h 2012-10-08 04:25:33.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/rtld/common/_rtld.h 2012-10-19 04:33:57.666164715 +0400 +--- libc.orig/usr/src/cmd/sgs/rtld/common/_rtld.h 2012-10-08 04:25:33.000000000 +0400 ++++ libc/usr/src/cmd/sgs/rtld/common/_rtld.h 2012-10-19 04:33:57.666164715 +0400 @@ -33,7 +33,7 @@ */ #include <sys/types.h> @@ -87,10 +87,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/rtld/common/_rtld.h #include <sys/mman.h> #include <stdarg.h> #include <synch.h> -Index: libc/illumos-gate/usr/src/cmd/sgs/rtld/common/remove.c +Index: libc/usr/src/cmd/sgs/rtld/common/remove.c =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/rtld/common/remove.c 2012-10-08 04:25:33.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/rtld/common/remove.c 2012-10-19 04:33:57.667634065 +0400 +--- libc.orig/usr/src/cmd/sgs/rtld/common/remove.c 2012-10-08 04:25:33.000000000 +0400 ++++ libc/usr/src/cmd/sgs/rtld/common/remove.c 2012-10-19 04:33:57.667634065 +0400 @@ -54,7 +54,7 @@ #include <unistd.h> #include <dlfcn.h> @@ -100,10 +100,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/rtld/common/remove.c #include <libc_int.h> #include <debug.h> #include "_rtld.h" -Index: libc/illumos-gate/usr/src/common/avl/avl.c +Index: libc/usr/src/common/avl/avl.c =================================================================== ---- libc.orig/illumos-gate/usr/src/common/avl/avl.c 2012-10-08 04:25:34.000000000 +0400 -+++ libc/illumos-gate/usr/src/common/avl/avl.c 2012-10-19 04:35:57.757101655 +0400 +--- libc.orig/usr/src/common/avl/avl.c 2012-10-08 04:25:34.000000000 +0400 ++++ libc/usr/src/common/avl/avl.c 2012-10-19 04:35:57.757101655 +0400 @@ -90,7 +90,7 @@ #include <sys/types.h> #include <sys/param.h> @@ -113,10 +113,10 @@ Index: libc/illumos-gate/usr/src/common/avl/avl.c #include <sys/cmn_err.h> /* -Index: libc/illumos-gate/usr/src/cmd/sgs/tools/Makefile.com +Index: libc/usr/src/cmd/sgs/tools/Makefile.com =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/tools/Makefile.com 2012-10-08 04:25:33.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/tools/Makefile.com 2012-10-19 06:45:34.761955095 +0400 +--- libc.orig/usr/src/cmd/sgs/tools/Makefile.com 2012-10-08 04:25:33.000000000 +0400 ++++ libc/usr/src/cmd/sgs/tools/Makefile.com 2012-10-19 06:45:34.761955095 +0400 @@ -52,7 +52,7 @@ SGSMSG_SRCS= $(TOOL_OBJS:%.o=../common/%.c) \ $(AVLOBJ:%.o=$(VAR_AVLDIR)/%.c) diff --git a/libc/debian/patches/sgs-crle-multiarch.patch b/libc/debian/patches/sgs-crle-multiarch.patch index e081b61..78c4762 100644 --- a/libc/debian/patches/sgs-crle-multiarch.patch +++ b/libc/debian/patches/sgs-crle-multiarch.patch @@ -4,10 +4,10 @@ Description: multiarch support for crle(1) a wrapper which execute the right version of crle, e. g.: /usr/lib/x86_64-illumos/crle for 64 bits, and /usr/lib32/crle for 32 bits on amd64 system. -Index: libc/illumos-gate/usr/src/cmd/sgs/crle/common/crle.c +Index: libc/usr/src/cmd/sgs/crle/common/crle.c =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/crle/common/crle.c 2012-10-08 04:25:33.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/crle/common/crle.c 2012-10-18 00:50:16.483774980 +0400 +--- libc.orig/usr/src/cmd/sgs/crle/common/crle.c 2012-10-08 04:25:33.000000000 +0400 ++++ libc/usr/src/cmd/sgs/crle/common/crle.c 2012-10-18 00:50:16.483774980 +0400 @@ -137,6 +137,7 @@ crle.c_flags |= CRLE_ADDID; crle.c_strbkts = 503; @@ -111,10 +111,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/crle/common/crle.c case 'A': /* alternative is optional */ flag = RTC_OBJ_OPTINAL; -Index: libc/illumos-gate/usr/src/cmd/sgs/crle/common/crle.msg +Index: libc/usr/src/cmd/sgs/crle/common/crle.msg =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/crle/common/crle.msg 2012-10-08 04:25:33.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/crle/common/crle.msg 2012-10-18 16:34:14.238056334 +0400 +--- libc.orig/usr/src/cmd/sgs/crle/common/crle.msg 2012-10-08 04:25:33.000000000 +0400 ++++ libc/usr/src/cmd/sgs/crle/common/crle.msg 2012-10-18 16:34:14.238056334 +0400 @@ -33,11 +33,10 @@ # Argument usage messages. @@ -199,10 +199,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/crle/common/crle.msg @ MSG_CMD_ALTER "-a %s" @ MSG_CMD_OPTIONAL "-A %s" @ MSG_CMD_CONF "-c %s" -Index: libc/illumos-gate/usr/src/cmd/sgs/crle/Makefile.com +Index: libc/usr/src/cmd/sgs/crle/Makefile.com =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/crle/Makefile.com 2012-10-08 04:25:33.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/crle/Makefile.com 2012-10-18 15:05:02.206602638 +0400 +--- libc.orig/usr/src/cmd/sgs/crle/Makefile.com 2012-10-08 04:25:33.000000000 +0400 ++++ libc/usr/src/cmd/sgs/crle/Makefile.com 2012-10-18 15:05:02.206602638 +0400 @@ -36,13 +36,15 @@ OBJS= $(BLTOBJ) $(COMOBJ) $(TOOLSOBJ) @@ -224,10 +224,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/crle/Makefile.com LDFLAGS += $(VERSREF) $(CC_USE_PROTO) $(MAPOPT) \ $(LLDFLAGS) $(ZNOLAZYLOAD) LDLIBS += -lelf $(CONVLIBDIR) $(CONV_LIB) $(DLLIB) -Index: libc/illumos-gate/usr/src/cmd/sgs/crle/Makefile.targ +Index: libc/usr/src/cmd/sgs/crle/Makefile.targ =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/crle/Makefile.targ 2012-10-08 04:25:33.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/crle/Makefile.targ 2012-10-18 00:50:16.488754209 +0400 +--- libc.orig/usr/src/cmd/sgs/crle/Makefile.targ 2012-10-08 04:25:33.000000000 +0400 ++++ libc/usr/src/cmd/sgs/crle/Makefile.targ 2012-10-18 00:50:16.488754209 +0400 @@ -29,8 +29,14 @@ $(COMPILE.c) $< $(POST_PROCESS_O) @@ -244,10 +244,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/crle/Makefile.targ all: $(PROG) -Index: libc/illumos-gate/usr/src/cmd/sgs/crle/amd64/Makefile +Index: libc/usr/src/cmd/sgs/crle/amd64/Makefile =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/crle/amd64/Makefile 2012-10-08 04:25:33.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/crle/amd64/Makefile 2012-10-18 00:50:16.490603672 +0400 +--- libc.orig/usr/src/cmd/sgs/crle/amd64/Makefile 2012-10-08 04:25:33.000000000 +0400 ++++ libc/usr/src/cmd/sgs/crle/amd64/Makefile 2012-10-18 00:50:16.490603672 +0400 @@ -38,6 +38,7 @@ LINTFLAGS64 += $(VAR_LINTFLAGS64) @@ -256,10 +256,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/crle/amd64/Makefile lint: $(LINTOUT64) -Index: libc/illumos-gate/usr/src/cmd/sgs/crle/common/_crle.h +Index: libc/usr/src/cmd/sgs/crle/common/_crle.h =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/crle/common/_crle.h 2012-10-08 04:25:33.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/crle/common/_crle.h 2012-10-18 00:50:16.492101642 +0400 +--- libc.orig/usr/src/cmd/sgs/crle/common/_crle.h 2012-10-08 04:25:33.000000000 +0400 ++++ libc/usr/src/cmd/sgs/crle/common/_crle.h 2012-10-18 00:50:16.492101642 +0400 @@ -154,6 +154,7 @@ APlist *c_flt; /* filter/filtee associations */ uint_t c_fltrnum; /* and associated filter number */ @@ -268,10 +268,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/crle/common/_crle.h } Crle_desc; #define CRLE_CREAT 0x0001 /* config file creation required */ -Index: libc/illumos-gate/usr/src/cmd/sgs/crle/common/print.c +Index: libc/usr/src/cmd/sgs/crle/common/print.c =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/crle/common/print.c 2012-10-08 04:25:33.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/crle/common/print.c 2012-10-18 16:42:13.032749019 +0400 +--- libc.orig/usr/src/cmd/sgs/crle/common/print.c 2012-10-08 04:25:33.000000000 +0400 ++++ libc/usr/src/cmd/sgs/crle/common/print.c 2012-10-18 16:42:13.032749019 +0400 @@ -38,6 +38,19 @@ #include "_crle.h" #include "msg.h" @@ -418,10 +418,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/crle/common/print.c return (INSCFG_RET_OK); } -Index: libc/illumos-gate/usr/src/man/man1/crle.1 +Index: libc/usr/src/man/man1/crle.1 =================================================================== ---- libc.orig/illumos-gate/usr/src/man/man1/crle.1 2012-10-08 04:25:44.000000000 +0400 -+++ libc/illumos-gate/usr/src/man/man1/crle.1 2012-10-18 00:50:16.502794181 +0400 +--- libc.orig/usr/src/man/man1/crle.1 2012-10-08 04:25:44.000000000 +0400 ++++ libc/usr/src/man/man1/crle.1 2012-10-18 00:50:16.502794181 +0400 @@ -9,9 +9,9 @@ .SH SYNOPSIS .LP diff --git a/libc/debian/patches/sgs-install-libconv.patch b/libc/debian/patches/sgs-install-libconv.patch index b1bbd00..2edddd4 100644 --- a/libc/debian/patches/sgs-install-libconv.patch +++ b/libc/debian/patches/sgs-install-libconv.patch @@ -1,10 +1,10 @@ Description: install static convenient library, so the compiler will find proper version. This is needed to compile single (native) version on ldd -Index: libc/illumos-gate/usr/src/cmd/sgs/libconv/amd64/Makefile +Index: libc/usr/src/cmd/sgs/libconv/amd64/Makefile =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/libconv/amd64/Makefile 2012-09-30 20:41:16.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/libconv/amd64/Makefile 2012-10-07 15:50:14.200506636 +0400 +--- libc.orig/usr/src/cmd/sgs/libconv/amd64/Makefile 2012-09-30 20:41:16.000000000 +0400 ++++ libc/usr/src/cmd/sgs/libconv/amd64/Makefile 2012-10-07 15:50:14.200506636 +0400 @@ -31,7 +31,9 @@ .PARALLEL: $(PICS) .KEEP_STATE: @@ -16,10 +16,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/libconv/amd64/Makefile include ../Makefile.targ include ../../Makefile.sub.64 -Index: libc/illumos-gate/usr/src/cmd/sgs/libconv/i386/Makefile +Index: libc/usr/src/cmd/sgs/libconv/i386/Makefile =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/libconv/i386/Makefile 2012-09-30 20:41:16.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/libconv/i386/Makefile 2012-10-07 15:51:40.777583661 +0400 +--- libc.orig/usr/src/cmd/sgs/libconv/i386/Makefile 2012-09-30 20:41:16.000000000 +0400 ++++ libc/usr/src/cmd/sgs/libconv/i386/Makefile 2012-10-07 15:51:40.777583661 +0400 @@ -31,6 +31,8 @@ .PARALLEL: $(PICS) .KEEP_STATE: diff --git a/libc/debian/patches/sgs-ldd.patch b/libc/debian/patches/sgs-ldd.patch index 03b97f7..e3917b5 100644 --- a/libc/debian/patches/sgs-ldd.patch +++ b/libc/debian/patches/sgs-ldd.patch @@ -1,7 +1,7 @@ -Index: libc/illumos-gate/usr/src/cmd/sgs/ldd/Makefile.com +Index: libc/usr/src/cmd/sgs/ldd/Makefile.com =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/ldd/Makefile.com 2012-09-30 20:41:16.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/ldd/Makefile.com 2012-10-07 16:25:06.332683692 +0400 +--- libc.orig/usr/src/cmd/sgs/ldd/Makefile.com 2012-09-30 20:41:16.000000000 +0400 ++++ libc/usr/src/cmd/sgs/ldd/Makefile.com 2012-10-07 16:25:06.332683692 +0400 @@ -35,16 +35,15 @@ OBJS= $(BLTOBJ) $(COMOBJ) $(TOOLSOBJ) diff --git a/libc/debian/patches/sgs-lddstub.patch b/libc/debian/patches/sgs-lddstub.patch index a3fb825..091b5fc 100644 --- a/libc/debian/patches/sgs-lddstub.patch +++ b/libc/debian/patches/sgs-lddstub.patch @@ -1,7 +1,7 @@ -Index: libc/illumos-gate/usr/src/cmd/sgs/lddstub/Makefile.targ +Index: libc/usr/src/cmd/sgs/lddstub/Makefile.targ =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/lddstub/Makefile.targ 2012-10-07 18:41:42.734828092 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/lddstub/Makefile.targ 2012-10-07 19:01:32.923970931 +0400 +--- libc.orig/usr/src/cmd/sgs/lddstub/Makefile.targ 2012-10-07 18:41:42.734828092 +0400 ++++ libc/usr/src/cmd/sgs/lddstub/Makefile.targ 2012-10-07 19:01:32.923970931 +0400 @@ -30,10 +30,16 @@ all: $(PROG) @@ -19,10 +19,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/lddstub/Makefile.targ clean: $(RM) $(OBJS) $(CLEANFILES) -Index: libc/illumos-gate/usr/src/cmd/sgs/lddstub/Makefile.com +Index: libc/usr/src/cmd/sgs/lddstub/Makefile.com =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/lddstub/Makefile.com 2012-10-07 18:41:42.734817823 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/lddstub/Makefile.com 2012-10-07 19:01:32.924259075 +0400 +--- libc.orig/usr/src/cmd/sgs/lddstub/Makefile.com 2012-10-07 18:41:42.734817823 +0400 ++++ libc/usr/src/cmd/sgs/lddstub/Makefile.com 2012-10-07 19:01:32.924259075 +0400 @@ -35,8 +35,6 @@ # As of Solaris 9 the kernel accepts $ORIGIN within the interpreter field. @@ -32,10 +32,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/lddstub/Makefile.com ASFLAGS= -P -D_ASM LDFLAGS= $(VERSREF) $(INTERP) $(CONVLIBDIR) -lconv -e stub \ $(LDFLAGS.cmd) -Index: libc/illumos-gate/usr/src/cmd/sgs/lddstub/amd64/Makefile +Index: libc/usr/src/cmd/sgs/lddstub/amd64/Makefile =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/lddstub/amd64/Makefile 2012-10-07 18:41:42.734850887 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/lddstub/amd64/Makefile 2012-10-07 19:01:32.924595447 +0400 +--- libc.orig/usr/src/cmd/sgs/lddstub/amd64/Makefile 2012-10-07 18:41:42.734850887 +0400 ++++ libc/usr/src/cmd/sgs/lddstub/amd64/Makefile 2012-10-07 19:01:32.924595447 +0400 @@ -34,7 +34,9 @@ ASFLAGS += -D__amd64 $(amd64_AS_XARCH) @@ -47,10 +47,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/lddstub/amd64/Makefile include ../Makefile.targ include ../../Makefile.sub.64 -Index: libc/illumos-gate/usr/src/cmd/sgs/lddstub/i386/Makefile +Index: libc/usr/src/cmd/sgs/lddstub/i386/Makefile =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/lddstub/i386/Makefile 2012-10-07 18:41:42.734792847 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/lddstub/i386/Makefile 2012-10-07 19:01:32.924937379 +0400 +--- libc.orig/usr/src/cmd/sgs/lddstub/i386/Makefile 2012-10-07 18:41:42.734792847 +0400 ++++ libc/usr/src/cmd/sgs/lddstub/i386/Makefile 2012-10-07 19:01:32.924937379 +0400 @@ -29,6 +29,9 @@ .KEEP_STATE: @@ -62,10 +62,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/lddstub/i386/Makefile + include ../Makefile.targ -Index: libc/illumos-gate/usr/src/cmd/sgs/libconv/common/lddstub.c +Index: libc/usr/src/cmd/sgs/libconv/common/lddstub.c =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/libconv/common/lddstub.c 2012-10-07 16:10:27.264531425 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/libconv/common/lddstub.c 2012-10-07 19:25:30.848288830 +0400 +--- libc.orig/usr/src/cmd/sgs/libconv/common/lddstub.c 2012-10-07 16:10:27.264531425 +0400 ++++ libc/usr/src/cmd/sgs/libconv/common/lddstub.c 2012-10-07 19:25:30.848288830 +0400 @@ -31,27 +31,6 @@ #include "_conv.h" #include "lddstub_msg.h" @@ -144,10 +144,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/libconv/common/lddstub.c - } return (stub); } -Index: libc/illumos-gate/usr/src/cmd/sgs/libconv/Makefile.com +Index: libc/usr/src/cmd/sgs/libconv/Makefile.com =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/libconv/Makefile.com 2012-09-30 20:41:16.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/libconv/Makefile.com 2012-10-07 19:27:29.263944396 +0400 +--- libc.orig/usr/src/cmd/sgs/libconv/Makefile.com 2012-09-30 20:41:16.000000000 +0400 ++++ libc/usr/src/cmd/sgs/libconv/Makefile.com 2012-10-07 19:27:29.263944396 +0400 @@ -100,6 +100,10 @@ CPPFLAGS += -I$(SRCBASE)/lib/libc/inc -I$(ELFCAP) \ -I$(SRC)/common/sgsrtcid diff --git a/libc/debian/patches/sgs-libconv-demangle.patch b/libc/debian/patches/sgs-libconv-demangle.patch index 15a1719..fbcefb9 100644 --- a/libc/debian/patches/sgs-libconv-demangle.patch +++ b/libc/debian/patches/sgs-libconv-demangle.patch @@ -1,10 +1,10 @@ Description: disable demangling for a while demangle.h is in binutils-dev and required functions are provided by libiberty.a (LGPL) -Index: b/illumos-gate/usr/src/cmd/sgs/libconv/common/demangle.c +Index: b/usr/src/cmd/sgs/libconv/common/demangle.c =================================================================== ---- a/illumos-gate/usr/src/cmd/sgs/libconv/common/demangle.c 2012-09-30 22:01:55.127280425 +0400 -+++ b/illumos-gate/usr/src/cmd/sgs/libconv/common/demangle.c 2012-09-30 22:04:25.096961240 +0400 +--- a/usr/src/cmd/sgs/libconv/common/demangle.c 2012-09-30 22:01:55.127280425 +0400 ++++ b/usr/src/cmd/sgs/libconv/common/demangle.c 2012-09-30 22:04:25.096961240 +0400 @@ -24,7 +24,6 @@ */ diff --git a/libc/debian/patches/sgs-libconv-makefile.patch b/libc/debian/patches/sgs-libconv-makefile.patch index e5a8c72..daf7e52 100644 --- a/libc/debian/patches/sgs-libconv-makefile.patch +++ b/libc/debian/patches/sgs-libconv-makefile.patch @@ -2,10 +2,10 @@ Description: Fixes for GNU make 1. Force GNU make to build *_msg.[hc] - just touch targets 2. Refine prerequisites -Index: b/illumos-gate/usr/src/cmd/sgs/libconv/Makefile.targ +Index: b/usr/src/cmd/sgs/libconv/Makefile.targ =================================================================== ---- a/illumos-gate/usr/src/cmd/sgs/libconv/Makefile.targ 2012-09-30 22:01:54.999877797 +0400 -+++ b/illumos-gate/usr/src/cmd/sgs/libconv/Makefile.targ 2012-09-30 22:04:25.678907702 +0400 +--- a/usr/src/cmd/sgs/libconv/Makefile.targ 2012-09-30 22:01:54.999877797 +0400 ++++ b/usr/src/cmd/sgs/libconv/Makefile.targ 2012-09-30 22:04:25.678907702 +0400 @@ -57,10 +57,11 @@ perl ../../tools/libconv_mk_report_bufsize.pl 8000 diff --git a/libc/debian/patches/sgs-libdl-filter.patch b/libc/debian/patches/sgs-libdl-filter.patch index 925fca0..1819e6a 100644 --- a/libc/debian/patches/sgs-libdl-filter.patch +++ b/libc/debian/patches/sgs-libdl-filter.patch @@ -1,7 +1,7 @@ -Index: libc/illumos-gate/usr/src/cmd/sgs/libdl/amd64/Makefile +Index: libc/usr/src/cmd/sgs/libdl/amd64/Makefile =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/libdl/amd64/Makefile 2012-10-14 04:33:41.865009390 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/libdl/amd64/Makefile 2012-10-14 04:36:08.120704897 +0400 +--- libc.orig/usr/src/cmd/sgs/libdl/amd64/Makefile 2012-10-14 04:33:41.865009390 +0400 ++++ libc/usr/src/cmd/sgs/libdl/amd64/Makefile 2012-10-14 04:36:08.120704897 +0400 @@ -27,7 +27,7 @@ include ../Makefile.com include $(SRC)/lib/Makefile.lib.64 @@ -11,10 +11,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/libdl/amd64/Makefile install: all $(ROOTLIBDIR64) .WAIT $(ROOTLIBS64) $(ROOTLINKS64) -Index: libc/illumos-gate/usr/src/cmd/sgs/libdl/i386/Makefile +Index: libc/usr/src/cmd/sgs/libdl/i386/Makefile =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/libdl/i386/Makefile 2012-10-14 04:33:41.865067069 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/libdl/i386/Makefile 2012-10-14 04:35:50.654911992 +0400 +--- libc.orig/usr/src/cmd/sgs/libdl/i386/Makefile 2012-10-14 04:33:41.865067069 +0400 ++++ libc/usr/src/cmd/sgs/libdl/i386/Makefile 2012-10-14 04:35:50.654911992 +0400 @@ -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 ed9f3f0..5f9e39c 100644 --- a/libc/debian/patches/sgs-libelf-gnu-make.patch +++ b/libc/debian/patches/sgs-libelf-gnu-make.patch @@ -1,7 +1,7 @@ -Index: b/illumos-gate/usr/src/cmd/sgs/libelf/Makefile.com +Index: b/usr/src/cmd/sgs/libelf/Makefile.com =================================================================== ---- a/illumos-gate/usr/src/cmd/sgs/libelf/Makefile.com 2012-09-30 22:01:54.755688295 +0400 -+++ b/illumos-gate/usr/src/cmd/sgs/libelf/Makefile.com 2012-09-30 22:04:26.781117861 +0400 +--- a/usr/src/cmd/sgs/libelf/Makefile.com 2012-09-30 22:01:54.755688295 +0400 ++++ b/usr/src/cmd/sgs/libelf/Makefile.com 2012-09-30 22:04:26.781117861 +0400 @@ -74,8 +74,8 @@ CERRWARN += -_gcc=-Wno-uninitialized diff --git a/libc/debian/patches/sgs-libelf-no-demos.patch b/libc/debian/patches/sgs-libelf-no-demos.patch index 1cd434a..0642468 100644 --- a/libc/debian/patches/sgs-libelf-no-demos.patch +++ b/libc/debian/patches/sgs-libelf-no-demos.patch @@ -1,7 +1,7 @@ -Index: b/illumos-gate/usr/src/cmd/sgs/libelf/Makefile.targ +Index: b/usr/src/cmd/sgs/libelf/Makefile.targ =================================================================== ---- a/illumos-gate/usr/src/cmd/sgs/libelf/Makefile.targ 2012-09-30 22:01:54.359456284 +0400 -+++ b/illumos-gate/usr/src/cmd/sgs/libelf/Makefile.targ 2012-09-30 22:04:28.116915778 +0400 +--- a/usr/src/cmd/sgs/libelf/Makefile.targ 2012-09-30 22:01:54.359456284 +0400 ++++ b/usr/src/cmd/sgs/libelf/Makefile.targ 2012-09-30 22:04:28.116915778 +0400 @@ -46,7 +46,6 @@ install: all .WAIT $(ROOTFS_LIBS) $(ROOTFS_LINKS) \ diff --git a/libc/debian/patches/sgs-libelf-nolint.patch b/libc/debian/patches/sgs-libelf-nolint.patch index c0aaead..9a8a140 100644 --- a/libc/debian/patches/sgs-libelf-nolint.patch +++ b/libc/debian/patches/sgs-libelf-nolint.patch @@ -1,7 +1,7 @@ -Index: b/illumos-gate/usr/src/cmd/sgs/libelf/Makefile.targ +Index: b/usr/src/cmd/sgs/libelf/Makefile.targ =================================================================== ---- a/illumos-gate/usr/src/cmd/sgs/libelf/Makefile.targ 2012-09-30 22:04:28.116915778 +0400 -+++ b/illumos-gate/usr/src/cmd/sgs/libelf/Makefile.targ 2012-09-30 22:04:28.687798374 +0400 +--- a/usr/src/cmd/sgs/libelf/Makefile.targ 2012-09-30 22:04:28.116915778 +0400 ++++ b/usr/src/cmd/sgs/libelf/Makefile.targ 2012-09-30 22:04:28.687798374 +0400 @@ -44,9 +44,7 @@ all: $(BLTSRCS) .WAIT $(LIBS) $(LIBLINKS) diff --git a/libc/debian/patches/sgs-libelf-rename.patch b/libc/debian/patches/sgs-libelf-rename.patch index b223b3b..5acf923 100644 --- a/libc/debian/patches/sgs-libelf-rename.patch +++ b/libc/debian/patches/sgs-libelf-rename.patch @@ -1,7 +1,7 @@ -Index: libc/illumos-gate/usr/src/cmd/sgs/libelf/Makefile.com +Index: libc/usr/src/cmd/sgs/libelf/Makefile.com =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/libelf/Makefile.com 2012-10-02 01:28:18.717892621 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/libelf/Makefile.com 2012-10-02 01:28:18.785171799 +0400 +--- libc.orig/usr/src/cmd/sgs/libelf/Makefile.com 2012-10-02 01:28:18.717892621 +0400 ++++ libc/usr/src/cmd/sgs/libelf/Makefile.com 2012-10-02 01:28:18.785171799 +0400 @@ -22,7 +22,7 @@ # Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved. # diff --git a/libc/debian/patches/sgs-libld-lib64.patch b/libc/debian/patches/sgs-libld-lib64.patch index 29cb5c1..1d2df97 100644 --- a/libc/debian/patches/sgs-libld-lib64.patch +++ b/libc/debian/patches/sgs-libld-lib64.patch @@ -1,7 +1,7 @@ -Index: b/illumos-gate/usr/src/cmd/sgs/libld/amd64/Makefile +Index: b/usr/src/cmd/sgs/libld/amd64/Makefile =================================================================== ---- a/illumos-gate/usr/src/cmd/sgs/libld/amd64/Makefile 2012-09-30 22:01:53.889429427 +0400 -+++ b/illumos-gate/usr/src/cmd/sgs/libld/amd64/Makefile 2012-09-30 22:04:29.255620796 +0400 +--- a/usr/src/cmd/sgs/libld/amd64/Makefile 2012-09-30 22:01:53.889429427 +0400 ++++ b/usr/src/cmd/sgs/libld/amd64/Makefile 2012-09-30 22:04:29.255620796 +0400 @@ -30,8 +30,6 @@ .KEEP_STATE: diff --git a/libc/debian/patches/sgs-liblddbg-lib64.patch b/libc/debian/patches/sgs-liblddbg-lib64.patch index f15a10d..afedd4c 100644 --- a/libc/debian/patches/sgs-liblddbg-lib64.patch +++ b/libc/debian/patches/sgs-liblddbg-lib64.patch @@ -1,7 +1,7 @@ -Index: b/illumos-gate/usr/src/cmd/sgs/liblddbg/amd64/Makefile +Index: b/usr/src/cmd/sgs/liblddbg/amd64/Makefile =================================================================== ---- a/illumos-gate/usr/src/cmd/sgs/liblddbg/amd64/Makefile 2012-09-30 22:01:54.879596612 +0400 -+++ b/illumos-gate/usr/src/cmd/sgs/liblddbg/amd64/Makefile 2012-09-30 22:04:26.231254711 +0400 +--- a/usr/src/cmd/sgs/liblddbg/amd64/Makefile 2012-09-30 22:01:54.879596612 +0400 ++++ b/usr/src/cmd/sgs/liblddbg/amd64/Makefile 2012-09-30 22:04:26.231254711 +0400 @@ -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 558e23b..7cb586d 100644 --- a/libc/debian/patches/sgs-librtld_db-nolint.patch +++ b/libc/debian/patches/sgs-librtld_db-nolint.patch @@ -1,7 +1,7 @@ -Index: b/illumos-gate/usr/src/cmd/sgs/librtld_db/amd64/Makefile +Index: b/usr/src/cmd/sgs/librtld_db/amd64/Makefile =================================================================== ---- a/illumos-gate/usr/src/cmd/sgs/librtld_db/amd64/Makefile 2012-09-30 22:01:53.041127525 +0400 -+++ b/illumos-gate/usr/src/cmd/sgs/librtld_db/amd64/Makefile 2012-09-30 22:04:33.588743894 +0400 +--- a/usr/src/cmd/sgs/librtld_db/amd64/Makefile 2012-09-30 22:01:53.041127525 +0400 ++++ b/usr/src/cmd/sgs/librtld_db/amd64/Makefile 2012-09-30 22:04:33.588743894 +0400 @@ -40,7 +40,6 @@ all: $(DYNLIB) $(LINTLIB) @@ -10,10 +10,10 @@ Index: b/illumos-gate/usr/src/cmd/sgs/librtld_db/amd64/Makefile pics/plt32_resolution.o: ../i386/plt32_resolution.c $(COMPILE.c) -D_ELF32 $(PICFLAGS) -o $@ \ -Index: b/illumos-gate/usr/src/cmd/sgs/librtld_db/i386/Makefile +Index: b/usr/src/cmd/sgs/librtld_db/i386/Makefile =================================================================== ---- a/illumos-gate/usr/src/cmd/sgs/librtld_db/i386/Makefile 2012-09-30 22:01:53.041183315 +0400 -+++ b/illumos-gate/usr/src/cmd/sgs/librtld_db/i386/Makefile 2012-09-30 22:04:33.589625197 +0400 +--- a/usr/src/cmd/sgs/librtld_db/i386/Makefile 2012-09-30 22:01:53.041183315 +0400 ++++ b/usr/src/cmd/sgs/librtld_db/i386/Makefile 2012-09-30 22:04:33.589625197 +0400 @@ -38,7 +38,6 @@ all: $(DYNLIB) $(LINTLIB) diff --git a/libc/debian/patches/sgs-rtld-default-lib-path.patch b/libc/debian/patches/sgs-rtld-default-lib-path.patch index 8d9c409..3b6e9d1 100644 --- a/libc/debian/patches/sgs-rtld-default-lib-path.patch +++ b/libc/debian/patches/sgs-rtld-default-lib-path.patch @@ -1,10 +1,10 @@ Description: set default library search path with respect to multiarch, these changes must be consistent with crle. -Index: libc/illumos-gate/usr/src/cmd/sgs/rtld/common/elf.c +Index: libc/usr/src/cmd/sgs/rtld/common/elf.c =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/rtld/common/elf.c 2012-10-18 00:50:12.103782023 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/rtld/common/elf.c 2012-10-18 16:46:02.236929082 +0400 +--- libc.orig/usr/src/cmd/sgs/rtld/common/elf.c 2012-10-18 00:50:12.103782023 +0400 ++++ libc/usr/src/cmd/sgs/rtld/common/elf.c 2012-10-18 16:46:02.236929082 +0400 @@ -52,24 +52,40 @@ /* * Default and secure dependency search paths. @@ -57,10 +57,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/rtld/common/elf.c #endif { 0, 0 } }; -Index: libc/illumos-gate/usr/src/cmd/sgs/rtld/Makefile.com +Index: libc/usr/src/cmd/sgs/rtld/Makefile.com =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/rtld/Makefile.com 2012-10-08 04:25:33.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/rtld/Makefile.com 2012-10-18 00:50:15.143119479 +0400 +--- libc.orig/usr/src/cmd/sgs/rtld/Makefile.com 2012-10-08 04:25:33.000000000 +0400 ++++ libc/usr/src/cmd/sgs/rtld/Makefile.com 2012-10-18 00:50:15.143119479 +0400 @@ -81,6 +81,14 @@ -I$(ELFCAP) \ $(CPPFEATUREMACROS) diff --git a/libc/debian/patches/sgs-rtld.patch b/libc/debian/patches/sgs-rtld.patch index dec4d0e..1bd2fdf 100644 --- a/libc/debian/patches/sgs-rtld.patch +++ b/libc/debian/patches/sgs-rtld.patch @@ -1,7 +1,7 @@ -Index: libc/illumos-gate/usr/src/cmd/sgs/rtld/Makefile.targ +Index: libc/usr/src/cmd/sgs/rtld/Makefile.targ =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/rtld/Makefile.targ 2012-10-08 04:25:33.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/rtld/Makefile.targ 2012-10-15 02:21:56.539058071 +0400 +--- libc.orig/usr/src/cmd/sgs/rtld/Makefile.targ 2012-10-08 04:25:33.000000000 +0400 ++++ libc/usr/src/cmd/sgs/rtld/Makefile.targ 2012-10-15 02:21:56.539058071 +0400 @@ -67,7 +67,7 @@ $(POST_PROCESS_O) @@ -11,10 +11,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/rtld/Makefile.targ $(LDLIBS) $(CRTN) $(POST_PROCESS_SO) -Index: libc/illumos-gate/usr/src/cmd/sgs/rtld/amd64/Makefile +Index: libc/usr/src/cmd/sgs/rtld/amd64/Makefile =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/rtld/amd64/Makefile 2012-10-08 04:25:33.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/rtld/amd64/Makefile 2012-10-15 02:21:56.539708401 +0400 +--- libc.orig/usr/src/cmd/sgs/rtld/amd64/Makefile 2012-10-08 04:25:33.000000000 +0400 ++++ libc/usr/src/cmd/sgs/rtld/amd64/Makefile 2012-10-15 02:21:56.539708401 +0400 @@ -69,7 +69,7 @@ ADBSUB= $(ADBSUB64) CPPFLAGS += -D_ELF64 @@ -24,10 +24,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/rtld/amd64/Makefile SGSMSGTARG += $(SGSMSGINTEL) $(SGSMSGINTEL64) $(SGSMSG64) -Index: libc/illumos-gate/usr/src/cmd/sgs/rtld/i386/Makefile +Index: libc/usr/src/cmd/sgs/rtld/i386/Makefile =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/rtld/i386/Makefile 2012-10-08 04:25:33.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/rtld/i386/Makefile 2012-10-15 02:21:56.540420836 +0400 +--- libc.orig/usr/src/cmd/sgs/rtld/i386/Makefile 2012-10-08 04:25:33.000000000 +0400 ++++ libc/usr/src/cmd/sgs/rtld/i386/Makefile 2012-10-15 02:21:56.540420836 +0400 @@ -66,7 +66,7 @@ ADBGENCFLAGS += -erroff=%all ADBGENFLAGS += -milp32 @@ -37,10 +37,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/rtld/i386/Makefile SGSMSGTARG += $(SGSMSGINTEL) $(SGSMSGINTEL32) $(SGSMSG32) -Index: libc/illumos-gate/usr/src/cmd/sgs/rtld/Makefile +Index: libc/usr/src/cmd/sgs/rtld/Makefile =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/rtld/Makefile 2012-10-08 04:25:33.000000000 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/rtld/Makefile 2012-10-15 02:21:56.540945869 +0400 +--- libc.orig/usr/src/cmd/sgs/rtld/Makefile 2012-10-08 04:25:33.000000000 +0400 ++++ libc/usr/src/cmd/sgs/rtld/Makefile 2012-10-15 02:21:56.540945869 +0400 @@ -25,6 +25,6 @@ include $(SRC)/cmd/sgs/Makefile.com @@ -49,10 +49,10 @@ Index: libc/illumos-gate/usr/src/cmd/sgs/rtld/Makefile +EXTRASUBDIRS = include $(SRC)/cmd/sgs/Makefile.sub -Index: libc/illumos-gate/usr/src/cmd/sgs/rtld/common/elf.c +Index: libc/usr/src/cmd/sgs/rtld/common/elf.c =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/rtld/common/elf.c 2012-10-15 03:29:12.706632817 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/rtld/common/elf.c 2012-10-15 03:31:52.650597069 +0400 +--- libc.orig/usr/src/cmd/sgs/rtld/common/elf.c 2012-10-15 03:29:12.706632817 +0400 ++++ libc/usr/src/cmd/sgs/rtld/common/elf.c 2012-10-15 03:31:52.650597069 +0400 @@ -139,9 +139,9 @@ if (((*name == '/') && /* BEGIN CSTYLED */ diff --git a/libc/debian/patches/sgs.h-no-libelf.h.patch b/libc/debian/patches/sgs.h-no-libelf.h.patch index 1f56742..9bdc15f 100644 --- a/libc/debian/patches/sgs.h-no-libelf.h.patch +++ b/libc/debian/patches/sgs.h-no-libelf.h.patch @@ -1,10 +1,10 @@ Descriptions: libelf.h is not used but sgs tries system libelf.h (/usr/include) and does not search debian/tmp/usr/include -Index: libc/illumos-gate/usr/src/cmd/sgs/include/sgs.h +Index: libc/usr/src/cmd/sgs/include/sgs.h =================================================================== ---- libc.orig/illumos-gate/usr/src/cmd/sgs/include/sgs.h 2012-10-06 18:22:36.902719587 +0400 -+++ libc/illumos-gate/usr/src/cmd/sgs/include/sgs.h 2012-10-06 18:23:20.860030708 +0400 +--- libc.orig/usr/src/cmd/sgs/include/sgs.h 2012-10-06 18:22:36.902719587 +0400 ++++ libc/usr/src/cmd/sgs/include/sgs.h 2012-10-06 18:23:20.860030708 +0400 @@ -48,7 +48,6 @@ #include <sys/machelf.h> #include <stdlib.h> diff --git a/libc/debian/patches/text-domain-invisible-tail.patch b/libc/debian/patches/text-domain-invisible-tail.patch index fdd83e5..4f71426 100644 --- a/libc/debian/patches/text-domain-invisible-tail.patch +++ b/libc/debian/patches/text-domain-invisible-tail.patch @@ -2,10 +2,10 @@ Description: Value in makefile had invisible tail This resulted in syntax error in shell command: -DTEXT_DOMAIN=\"XXX \" <----- space after XXX ! -Index: b/illumos-gate/usr/src/cmd/Makefile.cmd +Index: b/usr/src/cmd/Makefile.cmd =================================================================== ---- a/illumos-gate/usr/src/cmd/Makefile.cmd 2012-09-30 22:01:52.922532103 +0400 -+++ b/illumos-gate/usr/src/cmd/Makefile.cmd 2012-09-30 22:04:34.244177270 +0400 +--- a/usr/src/cmd/Makefile.cmd 2012-09-30 22:01:52.922532103 +0400 ++++ b/usr/src/cmd/Makefile.cmd 2012-09-30 22:04:34.244177270 +0400 @@ -496,7 +496,7 @@ $(POST_PROCESS) diff --git a/libc/debian/patches/zic-gnu-make-workaround.patch b/libc/debian/patches/zic-gnu-make-workaround.patch index 4bfe375..2ce7060 100644 --- a/libc/debian/patches/zic-gnu-make-workaround.patch +++ b/libc/debian/patches/zic-gnu-make-workaround.patch @@ -1,7 +1,7 @@ -Index: b/illumos-gate/usr/src/cmd/zic/Makefile +Index: b/usr/src/cmd/zic/Makefile =================================================================== ---- a/illumos-gate/usr/src/cmd/zic/Makefile 2012-09-30 22:01:52.799594258 +0400 -+++ b/illumos-gate/usr/src/cmd/zic/Makefile 2012-09-30 22:04:34.814531753 +0400 +--- a/usr/src/cmd/zic/Makefile 2012-09-30 22:01:52.799594258 +0400 ++++ b/usr/src/cmd/zic/Makefile 2012-09-30 22:04:34.814531753 +0400 @@ -90,7 +90,7 @@ lint: lint_SRCS diff --git a/libc/debian/patches/zic-only-zic.patch b/libc/debian/patches/zic-only-zic.patch index 3fbab91..7c1568f 100644 --- a/libc/debian/patches/zic-only-zic.patch +++ b/libc/debian/patches/zic-only-zic.patch @@ -1,7 +1,7 @@ -Index: b/illumos-gate/usr/src/cmd/zic/Makefile +Index: b/usr/src/cmd/zic/Makefile =================================================================== ---- a/illumos-gate/usr/src/cmd/zic/Makefile 2012-09-30 22:04:34.814531753 +0400 -+++ b/illumos-gate/usr/src/cmd/zic/Makefile 2012-09-30 22:04:35.385241480 +0400 +--- a/usr/src/cmd/zic/Makefile 2012-09-30 22:04:34.814531753 +0400 ++++ b/usr/src/cmd/zic/Makefile 2012-09-30 22:04:35.385241480 +0400 @@ -58,8 +58,7 @@ $(LINK.c) $(OBJS) -o $@ $(LDLIBS) $(POST_PROCESS) diff --git a/libc/debian/rules b/libc/debian/rules index f25ad40..7982de6 100755 --- a/libc/debian/rules +++ b/libc/debian/rules @@ -79,17 +79,17 @@ unpack: unpack-stamp unpack-stamp: dh_testdir dh_illumos_gate - echo 'export DEB_CRYPT_MODULE_DIR_32="$$DEB_LIBDIR_32/security"' >> illumos-gate/env.sh - echo 'export DEB_CRYPT_MODULE_DIR_64="$$DEB_LIBDIR_64/security"' >> illumos-gate/env.sh + echo 'export DEB_CRYPT_MODULE_DIR_32="$$DEB_LIBDIR_32/security"' >> usr/env.sh + echo 'export DEB_CRYPT_MODULE_DIR_64="$$DEB_LIBDIR_64/security"' >> usr/env.sh touch $@ -libc-mapfile := illumos-gate/usr/src/lib/libc/port/mapfile-vers +libc-mapfile := usr/src/lib/libc/port/mapfile-vers patch: patch-stamp patch-stamp: unpack-stamp dh_testdir [ ! -f debian/patches/series ] || QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2 [ -f $(libc-mapfile).orig ] || mv $(libc-mapfile) $(libc-mapfile).orig - . illumos-gate/env.sh; sed -r \ + . usr/env.sh; sed -r \ -e "s,/usr/lib/ld.so.1,$$DEB_LIBDIR_32/ld.so.1," \ -e "s,/usr/lib/amd64/ld.so.1,$$DEB_LIBDIR_64/ld.so.1," \ $(libc-mapfile).orig > $(libc-mapfile) @@ -102,12 +102,12 @@ unpatch: rm -f patch-stamp fix-x-stamp: patch-stamp - find illumos-gate/usr/src/head -name \*.x \ + find usr/src/head -name \*.x \ -exec ./debian/fix.x.pl {} \; touch $@ dirs-stamp: - . illumos-gate/env.sh; mkdir -p \ + . usr/env.sh; mkdir -p \ debian/tmp$$DEB_CRYPT_MODULE_DIR_32 \ debian/tmp$$DEB_CRYPT_MODULE_DIR_64 \ debian/tmp$$DEB_LIBDIR_32 \ @@ -122,7 +122,7 @@ dirs-stamp: # These links also will go into libsunXXX-dev packages. # Watch out: libc build-conflicts with other libelf-dev and libavl-dev # implementations, and libsunXXX-dev will do too. - . illumos-gate/env.sh; \ + . usr/env.sh; \ ln -sf $(CURDIR)/debian/tmp$$DEB_LIBDIR_32/libsunelf.so.1 \ debian/tmp$$DEB_USRLIBDIR_32/libelf.so && \ ln -sf $(CURDIR)/debian/tmp$$DEB_LIBDIR_64/libsunelf.so.1 \ @@ -139,7 +139,7 @@ headers-stamp: patch-stamp dirs-stamp fix-x-stamp dh_illumos_make $(make) $(libs_headers:%=usr/src/lib/%) -t install_h # Make AVL tree library public ;-) mkdir -p debian/tmp/usr/include/libsunavl - cp illumos-gate/usr/src/uts/common/sys/avl*.h \ + cp usr/src/uts/common/sys/avl*.h \ debian/tmp/usr/include/libsunavl/ touch $@ @@ -220,8 +220,8 @@ binary-stamp: build-stamp # into source locale file. Illumos localedef does not support # copy action for including other files source files. debian/LC_DATA.gz: - sh illumos-gate/usr/src/cmd/localedef/data/ctype.sh \ - illumos-gate/usr/src/cmd/localedef/data/*.UTF-8.src \ + sh usr/src/cmd/localedef/data/ctype.sh \ + usr/src/cmd/localedef/data/*.UTF-8.src \ | gzip -c -9 > $@ debian/locales.config: debian/locales.config.in @@ -229,7 +229,7 @@ debian/locales.config: debian/locales.config.in $< > $@ crle: debian/crle.c - . illumos-gate/env.sh; unset LD_ALTEXEC; \ + . usr/env.sh; unset LD_ALTEXEC; \ $(CC) $(CFLAGS) -o $@ \ -DDEB_USRLIBDIR_32=\"$$DEB_USRLIBDIR_32\" \ -DDEB_USRLIBDIR_64=\"$$DEB_USRLIBDIR_64\" \ @@ -242,6 +242,6 @@ clean: unpatch dh_clean rm -f debian/LC_DATA.* rm -f debian/locales.config - rm -rf illumos-gate + rm -rf usr rm -f crle diff --git a/libc/debian/utmpd.manpages b/libc/debian/utmpd.manpages index a2d9ba6..9111004 100644 --- a/libc/debian/utmpd.manpages +++ b/libc/debian/utmpd.manpages @@ -1 +1 @@ -illumos-gate/usr/src/man/man1m/utmpd.1m +usr/src/man/man1m/utmpd.1m |