diff options
Diffstat (limited to 'libc/debian/patches/sgs-crle-multiarch.patch')
| -rw-r--r-- | libc/debian/patches/sgs-crle-multiarch.patch | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/libc/debian/patches/sgs-crle-multiarch.patch b/libc/debian/patches/sgs-crle-multiarch.patch index cba5ffa..f7642c9 100644 --- a/libc/debian/patches/sgs-crle-multiarch.patch +++ b/libc/debian/patches/sgs-crle-multiarch.patch @@ -4,10 +4,10 @@ Description: multiarch support for crle(1) a wrapper which execute the right version of crle, e. g.: /usr/lib/x86_64-illumos/crle for 64 bits, and /usr/lib32/crle for 32 bits on amd64 system. -Index: libc/usr/src/cmd/sgs/crle/common/crle.c +Index: b/usr/src/cmd/sgs/crle/common/crle.c =================================================================== ---- libc.orig/usr/src/cmd/sgs/crle/common/crle.c 2012-10-19 13:55:51.048787918 +0400 -+++ libc/usr/src/cmd/sgs/crle/common/crle.c 2012-10-19 13:57:04.368515632 +0400 +--- a/usr/src/cmd/sgs/crle/common/crle.c 2014-03-02 23:20:07.818199406 +0400 ++++ b/usr/src/cmd/sgs/crle/common/crle.c 2014-03-02 23:22:35.383534884 +0400 @@ -137,6 +137,7 @@ crle.c_flags |= CRLE_ADDID; crle.c_strbkts = 503; @@ -111,10 +111,10 @@ Index: libc/usr/src/cmd/sgs/crle/common/crle.c case 'A': /* alternative is optional */ flag = RTC_OBJ_OPTINAL; -Index: libc/usr/src/cmd/sgs/crle/common/crle.msg +Index: b/usr/src/cmd/sgs/crle/common/crle.msg =================================================================== ---- libc.orig/usr/src/cmd/sgs/crle/common/crle.msg 2012-10-19 13:55:51.048719984 +0400 -+++ libc/usr/src/cmd/sgs/crle/common/crle.msg 2012-10-19 13:57:04.369756046 +0400 +--- a/usr/src/cmd/sgs/crle/common/crle.msg 2014-03-02 23:20:07.818131549 +0400 ++++ b/usr/src/cmd/sgs/crle/common/crle.msg 2014-03-02 23:22:35.385262036 +0400 @@ -33,11 +33,10 @@ # Argument usage messages. @@ -199,10 +199,10 @@ Index: libc/usr/src/cmd/sgs/crle/common/crle.msg @ MSG_CMD_ALTER "-a %s" @ MSG_CMD_OPTIONAL "-A %s" @ MSG_CMD_CONF "-c %s" -Index: libc/usr/src/cmd/sgs/crle/Makefile.com +Index: b/usr/src/cmd/sgs/crle/Makefile.com =================================================================== ---- libc.orig/usr/src/cmd/sgs/crle/Makefile.com 2012-10-19 13:55:51.048845858 +0400 -+++ libc/usr/src/cmd/sgs/crle/Makefile.com 2012-10-19 13:57:04.371029829 +0400 +--- a/usr/src/cmd/sgs/crle/Makefile.com 2014-03-02 23:20:07.818078783 +0400 ++++ b/usr/src/cmd/sgs/crle/Makefile.com 2014-03-02 23:22:35.386548028 +0400 @@ -36,13 +36,15 @@ OBJS= $(BLTOBJ) $(COMOBJ) $(TOOLSOBJ) @@ -224,10 +224,10 @@ Index: libc/usr/src/cmd/sgs/crle/Makefile.com LDFLAGS += $(VERSREF) $(CC_USE_PROTO) $(MAPOPT) \ $(LLDFLAGS) $(ZNOLAZYLOAD) LDLIBS += -lelf $(CONVLIBDIR) $(CONV_LIB) $(DLLIB) -Index: libc/usr/src/cmd/sgs/crle/Makefile.targ +Index: b/usr/src/cmd/sgs/crle/Makefile.targ =================================================================== ---- libc.orig/usr/src/cmd/sgs/crle/Makefile.targ 2012-10-19 13:55:51.048904330 +0400 -+++ libc/usr/src/cmd/sgs/crle/Makefile.targ 2012-10-19 13:57:04.372060701 +0400 +--- a/usr/src/cmd/sgs/crle/Makefile.targ 2014-03-02 23:20:07.818233348 +0400 ++++ b/usr/src/cmd/sgs/crle/Makefile.targ 2014-03-02 23:22:35.387645917 +0400 @@ -29,8 +29,14 @@ $(COMPILE.c) $< $(POST_PROCESS_O) @@ -244,10 +244,10 @@ Index: libc/usr/src/cmd/sgs/crle/Makefile.targ all: $(PROG) -Index: libc/usr/src/cmd/sgs/crle/amd64/Makefile +Index: b/usr/src/cmd/sgs/crle/amd64/Makefile =================================================================== ---- libc.orig/usr/src/cmd/sgs/crle/amd64/Makefile 2012-10-19 13:55:51.048874361 +0400 -+++ libc/usr/src/cmd/sgs/crle/amd64/Makefile 2012-10-19 13:57:04.373193326 +0400 +--- a/usr/src/cmd/sgs/crle/amd64/Makefile 2014-03-02 23:20:07.817998905 +0400 ++++ b/usr/src/cmd/sgs/crle/amd64/Makefile 2014-03-02 23:22:35.389272295 +0400 @@ -38,6 +38,7 @@ LINTFLAGS64 += $(VAR_LINTFLAGS64) @@ -256,10 +256,10 @@ Index: libc/usr/src/cmd/sgs/crle/amd64/Makefile lint: $(LINTOUT64) -Index: libc/usr/src/cmd/sgs/crle/common/_crle.h +Index: b/usr/src/cmd/sgs/crle/common/_crle.h =================================================================== ---- libc.orig/usr/src/cmd/sgs/crle/common/_crle.h 2012-10-19 13:55:51.048758407 +0400 -+++ libc/usr/src/cmd/sgs/crle/common/_crle.h 2012-10-19 13:57:04.374128803 +0400 +--- a/usr/src/cmd/sgs/crle/common/_crle.h 2014-03-02 23:20:07.818155575 +0400 ++++ b/usr/src/cmd/sgs/crle/common/_crle.h 2014-03-02 23:22:35.391170353 +0400 @@ -154,6 +154,7 @@ APlist *c_flt; /* filter/filtee associations */ uint_t c_fltrnum; /* and associated filter number */ @@ -268,10 +268,10 @@ Index: libc/usr/src/cmd/sgs/crle/common/_crle.h } Crle_desc; #define CRLE_CREAT 0x0001 /* config file creation required */ -Index: libc/usr/src/cmd/sgs/crle/common/print.c +Index: b/usr/src/cmd/sgs/crle/common/print.c =================================================================== ---- libc.orig/usr/src/cmd/sgs/crle/common/print.c 2012-10-19 13:55:51.048816786 +0400 -+++ libc/usr/src/cmd/sgs/crle/common/print.c 2012-10-19 14:00:17.230111553 +0400 +--- a/usr/src/cmd/sgs/crle/common/print.c 2014-03-02 23:20:07.818177411 +0400 ++++ b/usr/src/cmd/sgs/crle/common/print.c 2014-03-02 23:22:35.393731054 +0400 @@ -38,6 +38,19 @@ #include "_crle.h" #include "msg.h" @@ -419,10 +419,10 @@ Index: libc/usr/src/cmd/sgs/crle/common/print.c return (INSCFG_RET_OK); } -Index: libc/usr/src/man/man1/crle.1 +Index: b/usr/src/man/man1/crle.1 =================================================================== ---- libc.orig/usr/src/man/man1/crle.1 2012-10-19 13:55:51.048661253 +0400 -+++ libc/usr/src/man/man1/crle.1 2012-10-19 13:57:04.377756089 +0400 +--- a/usr/src/man/man1/crle.1 2014-03-02 23:20:07.818255119 +0400 ++++ b/usr/src/man/man1/crle.1 2014-03-02 23:22:35.396496036 +0400 @@ -9,9 +9,9 @@ .SH SYNOPSIS .LP |