From 3f71edc3ef4672ea2bbe3d2f604ada121b3870ab Mon Sep 17 00:00:00 2001 From: Xiaofeng Yan Date: Thu, 2 Sep 2010 16:39:48 +0800 Subject: [PATCH] man: Add new man package A set of documentation tools: man, apropos and whatis Signed-off-by: Xiaofeng Yan --- .../man/man-1.6e/man-1.5g-nonrootbuild.patch | 12 ++ .../man/man-1.6e/man-1.5h1-gencat.patch | 10 ++ .../man/man-1.6e/man-1.5h1-make.patch | 13 ++ .../man/man-1.6e/man-1.5i2-initial.patch | 15 ++ .../man/man-1.6e/man-1.5i2-newline.patch | 11 ++ .../man/man-1.6e/man-1.5i2-overflow.patch | 12 ++ .../man/man-1.6e/man-1.5j-i18n.patch | 12 ++ .../man/man-1.6e/man-1.5j-nocache.patch | 12 ++ .../man/man-1.6e/man-1.5j-utf8.patch | 57 +++++++ .../man/man-1.6e/man-1.5k-confpath.patch | 11 ++ .../man/man-1.6e/man-1.5k-nonascii.patch | 14 ++ .../man/man-1.6e/man-1.5k-sofix.patch | 20 +++ .../man/man-1.6e/man-1.5m2-bug11621.patch | 11 ++ .../man/man-1.6e/man-1.5m2-buildroot.patch | 48 ++++++ .../man/man-1.6e/man-1.5m2-multiple.patch | 18 ++ .../man-1.5m2-no-color-for-printing.patch | 11 ++ .../man/man-1.6e/man-1.5m2-sigpipe.patch | 26 +++ .../man/man-1.6e/man-1.5m2-tv_fhs.patch | 27 +++ .../man/man-1.6e/man-1.6e-i18n_whatis.patch | 141 ++++++++++++++++ .../man-1.6e/man-1.6e-lzma+xz-support.patch | 142 ++++++++++++++++ .../man/man-1.6e/man-1.6e-mandirs.patch | 27 +++ .../man/man-1.6e/man-1.6e-new_sections.patch | 11 ++ .../man/man-1.6e/man-1.6e-ro_usr.patch | 67 ++++++++ .../man/man-1.6e/man-1.6e-security.patch | 58 +++++++ .../man-1.6e-use_i18n_vars_in_a_std_way.patch | 156 ++++++++++++++++++ .../man/man-1.6e/man-1.6e-whatis2.patch | 37 +++++ meta/recipes-extended/man/man-1.6e/man.1.gz | Bin 0 -> 12323 bytes meta/recipes-extended/man/man-1.6e/man.7.gz | Bin 0 -> 6192 bytes .../man/man-1.6e/manpath.5.gz | Bin 0 -> 2133 bytes meta/recipes-extended/man/man_1.6e.bb | 61 +++++++ 30 files changed, 1040 insertions(+) create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.5g-nonrootbuild.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.5h1-gencat.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.5h1-make.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.5i2-initial.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.5i2-newline.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.5i2-overflow.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.5j-i18n.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.5j-nocache.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.5j-utf8.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.5k-confpath.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.5k-nonascii.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.5k-sofix.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.5m2-bug11621.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.5m2-buildroot.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.5m2-multiple.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.5m2-no-color-for-printing.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.5m2-sigpipe.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.5m2-tv_fhs.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.6e-i18n_whatis.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.6e-lzma+xz-support.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.6e-mandirs.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.6e-new_sections.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.6e-ro_usr.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.6e-security.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.6e-use_i18n_vars_in_a_std_way.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man-1.6e-whatis2.patch create mode 100644 meta/recipes-extended/man/man-1.6e/man.1.gz create mode 100644 meta/recipes-extended/man/man-1.6e/man.7.gz create mode 100644 meta/recipes-extended/man/man-1.6e/manpath.5.gz create mode 100644 meta/recipes-extended/man/man_1.6e.bb diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5g-nonrootbuild.patch b/meta/recipes-extended/man/man-1.6e/man-1.5g-nonrootbuild.patch new file mode 100644 index 0000000000..ae2bc4d17f --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.5g-nonrootbuild.patch @@ -0,0 +1,12 @@ +diff -u -r man-1.5g.old/configure man-1.5g/configure +--- man-1.5g.old/configure Wed Apr 7 04:16:05 1999 ++++ man-1.5g/configure Mon May 15 15:22:44 2000 +@@ -791,7 +791,7 @@ + read mode + if test "$mode" != ""; then man_mode=$mode; fi + fi +- man_install_flags="-m $man_mode -o $man_user -g $man_group" ++ man_install_flags="" + fi + + # What sections do we anticipate? diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5h1-gencat.patch b/meta/recipes-extended/man/man-1.6e/man-1.5h1-gencat.patch new file mode 100644 index 0000000000..6409dfce55 --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.5h1-gencat.patch @@ -0,0 +1,10 @@ +--- gencat/genlib.c 2006-08-02 20:11:44.000000000 +0200 ++++ gencat/genlib.c.oden 2008-12-21 19:18:50.000000000 +0100 +@@ -47,6 +47,7 @@ up-to-date. Many thanks. + 01/14/91 4 nazgul Off by one on number specified entries + */ + ++#undef _GNU_SOURCE + #include + #include + #ifdef SYSV diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5h1-make.patch b/meta/recipes-extended/man/man-1.6e/man-1.5h1-make.patch new file mode 100644 index 0000000000..f9f91e4d0e --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.5h1-make.patch @@ -0,0 +1,13 @@ +--- man-1.5g/man/Makefile.in.mike Fri Apr 9 13:35:54 1999 ++++ man-1.5g/man/Makefile.in Fri Apr 9 13:36:45 1999 +@@ -1,8 +1,8 @@ + # only executed from a subdir + MAN1 = man whatis apropos +-MAN5 = man.conf ++MAN5 = man.config + MAN8 = makewhatis +-ALL = man.1 whatis.1 apropos.1 man.conf.5 ++ALL = man.1 whatis.1 apropos.1 man.config.5 + MAYBE8 = makewhatis + + .SUFFIXES: .man .1 .5 .8 diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5i2-initial.patch b/meta/recipes-extended/man/man-1.6e/man-1.5i2-initial.patch new file mode 100644 index 0000000000..1b1442385e --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.5i2-initial.patch @@ -0,0 +1,15 @@ +--- man-1.5i2/src/makewhatis.sh.initial Tue Jul 3 15:38:39 2001 ++++ man-1.5i2/src/makewhatis.sh Tue Jul 3 15:39:39 2001 +@@ -81,8 +81,10 @@ + continue;; + -s) setsections=1 + continue;; +- -u) findarg="-newer /var/cache/man/whatis" +- update=1 ++ -u) if [ -e /var/cache/man/whatis ]; then ++ findarg="-newer /var/cache/man/whatis" ++ update=1 ++ fi + continue;; + -v) verbose=1 + continue;; diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5i2-newline.patch b/meta/recipes-extended/man/man-1.6e/man-1.5i2-newline.patch new file mode 100644 index 0000000000..da95d5ad18 --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.5i2-newline.patch @@ -0,0 +1,11 @@ +--- src/man.c 2008-12-21 19:17:31.000000000 +0100 ++++ src/man.c.oden 2008-12-21 19:17:38.000000000 +0100 +@@ -391,7 +391,7 @@ again: + beg++; + + end = beg; +- while (*end != ' ' && *end != '\t' && *end != '\n' && *end != '\0') ++ while (*end != ' ' && *end != '\t' && *end != '\n' && *end != '\0' && (end-buf)sizeof(ultname)) _exit(1); + + goto again; + } diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5j-i18n.patch b/meta/recipes-extended/man/man-1.6e/man-1.5j-i18n.patch new file mode 100644 index 0000000000..7645542e16 --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.5j-i18n.patch @@ -0,0 +1,12 @@ +--- man-1.5j/msgs/inst.sh.i18n Wed Apr 25 10:40:50 2001 ++++ man-1.5j/msgs/inst.sh Wed Apr 25 10:41:17 2001 +@@ -27,8 +27,7 @@ + for j in $M; do + if [ -f $j ]; then + i=`echo $j | sed -e 's/mess.//; s/.cat//'` +- dest=`echo $locdir | sed -e "s/%N/man/; s/%L/$i/"` +- dest=${PREFIX}$dest ++ dest=${PREFIX}/`echo $locdir | sed -e "s/%N/man/; s/%L/$i/"` + echo "mkdir -p `dirname $dest`" + mkdir -p `dirname $dest`; + echo "install -c -m 644 $j $dest" diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5j-nocache.patch b/meta/recipes-extended/man/man-1.6e/man-1.5j-nocache.patch new file mode 100644 index 0000000000..267b34b93a --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.5j-nocache.patch @@ -0,0 +1,12 @@ +--- man-1.5j/src/man.conf.in.nocache Thu Nov 22 15:07:12 2001 ++++ man-1.5j/src/man.conf.in Thu Nov 22 15:07:12 2001 +@@ -81,6 +81,9 @@ + # + #NOCACHE + # ++# NOCACHE keeps man from creating cache pages ++NOCACHE ++# + # Useful paths - note that COL should not be defined when + # NROFF is defined as "groff -Tascii" or "groff -Tlatin1"; + # not only is it superfluous, but it actually damages the output. diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5j-utf8.patch b/meta/recipes-extended/man/man-1.6e/man-1.5j-utf8.patch new file mode 100644 index 0000000000..c817763676 --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.5j-utf8.patch @@ -0,0 +1,57 @@ +--- man-1.5j/configure.utf8 Thu Nov 22 15:02:35 2001 ++++ man-1.5j/configure Thu Nov 22 15:03:15 2001 +@@ -408,9 +408,9 @@ + Fgawk=/bin/gawk + Fawk=/bin/gawk + Fmawk=missing +- troff="" +- nroff="" +- jnroff="" ++ troff=/usr/bin/troff ++ nroff=/usr/bin/nroff ++ jnroff=/usr/bin/nroff + eqn="" + neqn="" + jneqn="" +@@ -453,6 +453,8 @@ + done + done + Fgroff=/usr/bin/groff ++ Fnroff=/usr/bin/nroff ++ Fjnroff=/usr/bin/nroff + Fgeqn=/usr/bin/geqn + Fgtbl=/usr/bin/gtbl + Fcol=/usr/bin/col +@@ -485,25 +487,25 @@ + then + if test $Fnroff = "missing" + then +- nroff="nroff -Tlatin1 -mandoc" ++ nroff="nroff -Tutf8 -mandoc" + else +- nroff="$Fnroff -Tlatin1 -mandoc" ++ nroff="$Fnroff -Tutf8 -mandoc" + fi + troff="troff -mandoc" + echo "Warning: could not find groff" + else + if test $Fnroff = "missing" + then +- nroff="$Fgroff -Tlatin1 -mandoc" ++ nroff="$Fgroff -Tutf8 -mandoc" + else +- nroff="$Fnroff -Tlatin1 -mandoc" ++ nroff="$Fnroff -Tutf8 -mandoc" + fi + troff="$Fgroff -Tps -mandoc" +- jnroff="$Fgroff -Tnippon -mandocj" ++ jnroff="$Fjnroff -Tutf8 -mandocj" + fi + eqn="$Fgeqn -Tps" +- neqn="$Fgeqn -Tlatin1" +- jneqn="$Fgeqn -Tnippon" ++ neqn="$Fgeqn -Tutf8" ++ jneqn="$Fgeqn -Tutf8" + tbl="$Fgtbl" + col="$Fcol" + vgrind="$Fvgrind" diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5k-confpath.patch b/meta/recipes-extended/man/man-1.6e/man-1.5k-confpath.patch new file mode 100644 index 0000000000..71ac9fcfc9 --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.5k-confpath.patch @@ -0,0 +1,11 @@ +--- configure 2006-05-01 19:56:14.000000000 +0200 ++++ configure.oden 2008-12-21 19:16:50.000000000 +0100 +@@ -198,7 +198,7 @@ + confdir="${confprefix}/share/misc" + fi + fi +-conffilename="man.conf" ++conffilename="man.config" + + if test "$RANDOM" = "$RANDOM"; then + # Plain old Bourne shell. diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5k-nonascii.patch b/meta/recipes-extended/man/man-1.6e/man-1.5k-nonascii.patch new file mode 100644 index 0000000000..465d839ea0 --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.5k-nonascii.patch @@ -0,0 +1,14 @@ +--- ./src/apropos.sh.nonascii 2001-11-23 00:30:42.000000000 +0100 ++++ ./src/apropos.sh 2002-08-13 15:44:53.000000000 +0200 +@@ -18,9 +18,9 @@ + + # When man pages in your favorite locale look to grep like binary files + # (and you use GNU grep) you may want to add the 'a' option to *grepopt1. +-aproposgrepopt1='i' ++aproposgrepopt1='ia' + aproposgrepopt2='' +-whatisgrepopt1='iw' ++whatisgrepopt1='iwa' + whatisgrepopt2='^' + grepopt1=$%apropos_or_whatis%grepopt1 + grepopt2=$%apropos_or_whatis%grepopt2 diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5k-sofix.patch b/meta/recipes-extended/man/man-1.6e/man-1.5k-sofix.patch new file mode 100644 index 0000000000..d4522ea974 --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.5k-sofix.patch @@ -0,0 +1,20 @@ +--- man-1.5j/src/man.c.sofix Thu Nov 22 14:51:44 2001 ++++ man-1.5j/src/man.c Thu Nov 22 14:52:44 2001 +@@ -300,7 +300,7 @@ + + if (strlen(name0) >= sizeof(ultname)) + return name0; +- strcpy(ultname, name0); ++ strncpy(ultname, name0, BUFSIZE-32); + name = ultname; + + again: +@@ -332,7 +332,7 @@ + * .so files - we could glob for all possible extensions, + * for now: only try .gz + */ +- else if (fp == NULL && get_expander(".gz") && ++ if (fp == NULL && get_expander(".gz") && + strlen(name)+strlen(".gz") < BUFSIZE) { + strcat(name, ".gz"); + fp = fopen (name, "r"); diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5m2-bug11621.patch b/meta/recipes-extended/man/man-1.6e/man-1.5m2-bug11621.patch new file mode 100644 index 0000000000..9c06c4c104 --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.5m2-bug11621.patch @@ -0,0 +1,11 @@ +--- ./configure.ad 2003-12-11 19:17:10.000000000 +0100 ++++ ./configure 2003-12-11 19:17:27.000000000 +0100 +@@ -26,7 +26,7 @@ + # (Indeed, -r may cause the terminal to get into funny states. + # Very inconvenient. For viewing pages in strange locales, set LC_*.) + # +-DEFAULTLESSOPT="-is" ++DEFAULTLESSOPT="-isr" + # + # Note that not creating any cat directories (/var/cache/man or so) + # and not making man suid or sgid is recommended. diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5m2-buildroot.patch b/meta/recipes-extended/man/man-1.6e/man-1.5m2-buildroot.patch new file mode 100644 index 0000000000..d84208390a --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.5m2-buildroot.patch @@ -0,0 +1,48 @@ +--- ./configure.less 2003-12-11 19:18:15.000000000 +0100 ++++ ./configure 2003-12-11 19:20:03.000000000 +0100 +@@ -401,18 +401,13 @@ + + if test "$ans" = "false" + then +- for i in more less cmp cat awk gawk mawk +- do +- eval F$i="missing" +- for j in $DEFPATH +- do +- if test -f $j/$i +- then +- eval F$i=$j/$i +- break +- fi +- done +- done ++ Fmore=/bin/more ++ Fless=/usr/bin/less ++ Fcmp=/usr/bin/cmp ++ Fcat=/bin/cat ++ Fgawk=/bin/gawk ++ Fawk=/bin/gawk ++ Fmawk=missing + troff="" + nroff="" + jnroff="" +@@ -457,6 +452,19 @@ + fi + done + done ++ Fgroff=/usr/bin/groff ++ Fgeqn=/usr/bin/geqn ++ Fgtbl=/usr/bin/gtbl ++ Fcol=/usr/bin/col ++ Fgrefer=/usr/bin/grefer ++ Fgpic=/usr/bin/gpic ++ Fmore=/bin/more ++ Fless=/usr/bin/less ++ Fcmp=/usr/bin/cmp ++ Fcat=/bin/cat ++ Fgawk=/bin/gawk ++ ++ + for i in eqn tbl refer pic + do + if test `eval echo \\$Fg$i` = "missing" diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5m2-multiple.patch b/meta/recipes-extended/man/man-1.6e/man-1.5m2-multiple.patch new file mode 100644 index 0000000000..cc5bffde63 --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.5m2-multiple.patch @@ -0,0 +1,18 @@ +--- man-1.5m2/src/manfile.c_multiple 2006-12-08 23:42:17.000000000 +0100 ++++ man-1.5m2/src/manfile.c 2006-12-09 00:00:01.000000000 +0100 +@@ -25,9 +25,12 @@ + + if (a) { + if (*head) { +- p = *head; +- while(p->next) +- p = p->next; ++ for (p = *head; p->next; p = p->next) { ++ if(!strcmp (p->filename, a->filename)) ++ return; ++ } ++ if(!strcmp (p->filename, a->filename)) ++ return; + p->next = a; + } else + *head = a; diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5m2-no-color-for-printing.patch b/meta/recipes-extended/man/man-1.6e/man-1.5m2-no-color-for-printing.patch new file mode 100644 index 0000000000..d1f810a442 --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.5m2-no-color-for-printing.patch @@ -0,0 +1,11 @@ +--- man-1.5m2/configure.color 2006-09-16 18:27:37.000000000 +0200 ++++ man-1.5m2/configure 2006-09-16 18:28:44.000000000 +0200 +@@ -539,6 +539,8 @@ + troff="$troff -c" + nroff="$nroff -c" + jnroff="$jnroff -c" ++else ++ troff="$troff -c" + fi + + if [ x$default = x ]; then diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5m2-sigpipe.patch b/meta/recipes-extended/man/man-1.6e/man-1.5m2-sigpipe.patch new file mode 100644 index 0000000000..81fb2d702a --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.5m2-sigpipe.patch @@ -0,0 +1,26 @@ +--- man-1.5m2/src/util.c_sigpipe 2006-12-09 13:43:21.000000000 +0100 ++++ man-1.5m2/src/util.c 2006-12-09 13:53:13.000000000 +0100 +@@ -116,11 +116,14 @@ + static int + system1 (const char *command) { + void (*prev_handler)(int) = signal (SIGINT,catch_int); ++ signal (SIGPIPE,SIG_IGN); + int ret = system(command); + + /* child terminated with signal? */ + if (WIFSIGNALED(ret) && +- (WTERMSIG(ret) == SIGINT || WTERMSIG(ret) == SIGQUIT)) ++ (WTERMSIG(ret) == SIGINT || ++ WTERMSIG(ret) == SIGPIPE || ++ WTERMSIG(ret) == SIGQUIT)) + exit(1); + + /* or we caught an interrupt? */ +@@ -128,6 +131,7 @@ + exit(1); + + signal(SIGINT,prev_handler); ++ signal(SIGPIPE,SIG_DFL); + return ret; + } + diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5m2-tv_fhs.patch b/meta/recipes-extended/man/man-1.6e/man-1.5m2-tv_fhs.patch new file mode 100644 index 0000000000..20389d9c08 --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.5m2-tv_fhs.patch @@ -0,0 +1,27 @@ +--- man/Makefile.in 2008-12-21 19:19:33.000000000 +0100 ++++ man/Makefile.in.oden 2008-12-21 19:19:39.000000000 +0100 +@@ -34,6 +34,15 @@ + for i in $(MAN8); \ + do if test -f $$i.8; then $(INSTALL) $$i.8 $(mandir)/man8/$$i.@man8ext@; fi; done + ++install-l10n: $(ALL) ++ mkdir -p $(mandir)/$(SLANG)/man1 $(mandir)/$(SLANG)/man5 $(mandir)/$(SLANG)/man8 ++ for i in $(MAN1); \ ++ do $(INSTALL) $$i.1 $(mandir)/$(SLANG)/man1/$$i.@man1ext@; done ++ for i in $(MAN5); \ ++ do $(INSTALL) $$i.5 $(mandir)/$(SLANG)/man5/$$i.@man5ext@; done ++ for i in $(MAN8); \ ++ do if test -f $$i.8; then $(INSTALL) $$i.8 $(mandir)/$(SLANG)/man8/$$i.@man8ext@; fi; done ++ + clean: + rm -f core *.in *.@man1ext@ *.@man5ext@ *.@man8ext@ *~ + +@@ -49,7 +58,7 @@ + @for i in @languages@; do if test -d $$i; then echo; \ + echo "==== Installing the `cat $$i.txt` man pages. ===="; \ + cd $$i; SLANG=/$$i; if test $$SLANG = /en; then SLANG= ; fi; \ +- export SLANG; make -f ../Makefile install; cd ..; \ ++ export SLANG; make -f ../Makefile install-l10n; cd ..; \ + else echo "==== No $$i man pages found. ===="; fi; done + + cleansubdirs: diff --git a/meta/recipes-extended/man/man-1.6e/man-1.6e-i18n_whatis.patch b/meta/recipes-extended/man/man-1.6e/man-1.6e-i18n_whatis.patch new file mode 100644 index 0000000000..ad62a6016f --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.6e-i18n_whatis.patch @@ -0,0 +1,141 @@ +diff -Naur man-1.6e.orig/src/apropos.sh man-1.6e/src/apropos.sh +--- man-1.6e.orig/src/apropos.sh 2007-05-18 13:49:31.000000000 -0300 ++++ man-1.6e/src/apropos.sh 2007-05-18 14:24:33.000000000 -0300 +@@ -60,16 +60,56 @@ + esac + done + ++# list of languages to look for ++LANG_LIST=`echo $LANGUAGE:$LC_ALL:$LC_MESSAGES:$LANG | tr ':' ' '` ++DIR_LIST="" ++for d in /var/cache/man $manpath /usr/lib ++do ++ for l in $LANG_LIST ++ do ++ if [ -d $d/$l ] ++ then ++ # check that the path is not already in the list ++ if ! echo "$DIR_LIST" | grep " $d/$l\b" > /dev/null ++ then ++ DIR_LIST="$DIR_LIST $d/$l" ++ fi ++ fi ++ done ++ DIR_LIST="$DIR_LIST $d" ++ # check that the path is not already in the list ++ if ! echo "$DIR_LIST" | grep " $d\b" > /dev/null ++ then ++ DIR_LIST="$DIR_LIST $d/$l" ++ fi ++done ++ + while [ "$1" != "" ] + do + found=0 +- for d in /var/cache/man $manpath /usr/lib ++ # in order not to display lines in more than one language for ++ # a same man page; we check that a given man page name ++ # hasn't already been displayed ++ BAZ="" ++ for d in $DIR_LIST + do + if [ -f $d/whatis ] + then +- if grep -"$grepopt1" "$grepopt2""$1" $d/whatis ++ if FOO=`grep -"$grepopt1" "$grepopt2""$1" $d/whatis` + then +- found=1 ++ # the LC_ALL=C is needed in case the text is ++ # in a different encoding than the locale ++ BAR=`echo -e "$FOO" | LC_ALL=C sed 's/ - .*$//' | tr ' []' '_' | sort -u` ++ for i in $BAR ++ do ++ if ! echo "$BAZ" | grep "$i" > /dev/null ++ then ++ BAZ="$BAZ $i" ++ i="^`echo $i | sed 's:_\+:\\\(\[_ \]\\\|\\\[\\\|\\\]\\\)\\\+:g'`" ++ echo -e "$FOO" | grep "$i" ++ found=1 ++ fi ++ done + # Some people are satisfied with a single occurrence + # But it is better to give all + # break +diff -Naur man-1.6e.orig/src/makewhatis.sh man-1.6e/src/makewhatis.sh +--- man-1.6e.orig/src/makewhatis.sh 2007-05-18 13:49:31.000000000 -0300 ++++ man-1.6e/src/makewhatis.sh 2007-05-18 13:50:07.000000000 -0300 +@@ -41,12 +41,32 @@ + + program=`basename $0` + ++# this allows to define language specific values fro NAME, DESCRIPTION ++# if not defined, using those default values ++if [ -z "$MAN_NAME" ] ++then ++ MAN_NAME="ИМЕ|NOM|JMÉNO|NAVN|ΟΝΟΜΑ|NOMBRE|NIME|IZENA|NIMI|IME|\ ++NÉV|NOME|名前|이름|NAAM|NAZWA|NUME|ИМЯ|MENO|НАЗВА|名称|名稱" ++fi ++if [ -z "$MAN_DESCRIPTION" ] ++then ++ MAN_DESCRIPTION="ОПИСАНИЕ|DESCRIPCIÓ|POPIS|BESKRIVELSE|BESCHREIBUNG|\ ++ΠΕΡΙΓΡΑΦΗ|DESCRIPCIÓN|KIRJELDUS|AZALPENA|KUVAUS|OPIS|LEÍRÁS|DESCRIZIONE|\ ++説明|설명|BESCHRIJVING|DESCRIÇÃO|DESCRIERE|ОПИС|描述" ++fi ++# make them into awk regexp ++MAN_NAME="^(${MAN_NAME})"; ++MAN_DESCRIPTION="^(${MAN_DESCRIPTION})"; ++ + # In case both /usr/man and /usr/share/man exist, the former is local + # and should be first. + # It is a bug to add /var/cache/man to DEFCATPATH. + dm= + for d in /usr/share/man /usr/man /usr/X11R6/man /usr/local/man + do ++ if [ -n "$LANG" -a -d "$d/$LANG" ]; then ++ if [ x$dm = x ]; then dm="$d/$LANG"; else dm=$dm:"$d/$LANG"; fi ++ fi + if [ -d $d ]; then + if [ x$dm = x ]; then dm=$d; else dm=$dm:$d; fi + fi +@@ -55,6 +75,9 @@ + dc= + for d in /var/cache/man /usr/share/man/preformat /usr/man/preformat /usr/share/man /usr/man + do ++ if [ -n "$LANG" -a -d "$d/$LANG" ]; then ++ if [ x$dc = x ]; then dm="$d/$LANG"; else dm=$dc:"$d/$LANG"; fi ++ fi + if [ -d $d ]; then + if [ x$dc = x ]; then dc=$d; else dc=$dc:$d; fi + fi +@@ -194,7 +217,7 @@ + section=$i + curdir=$mandir/${pages}$i + export section verbose curdir +- find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK ' ++ find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | LC_ALL=C $AWK -v MAN_NAME="$MAN_NAME" -v MAN_DESCRIPTION="$MAN_DESCRIPTION" ' + + function readline() { + if (use_zcat || use_bzcat) { +@@ -261,13 +284,7 @@ + gsub(/.\b/, ""); + if (($1 ~ /^\.[Ss][Hh]/ && + ($2 ~ /[Nn][Aa][Mm][Ee]/ || +- $2 ~ /^JMÉNO/ || $2 ~ /^NAVN/ || $2 ~ /^NUME/ || +- $2 ~ /^BEZEICHNUNG/ || $2 ~ /^NOMBRE/ || +- $2 ~ /^NIMI/ || $2 ~ /^NOM/ || $2 ~ /^IME/ || +- $2 ~ /^N[ÉE]V/ || $2 ~ /^NAMA/ || $2 ~ /^̾Á°/ || +- $2 ~ /^̾¾Î/ || $2 ~ /^À̸§/ || $2 ~ /^NAZWA/ || +- $2 ~ /^îáú÷áîéå/ || $2 ~ /^Ãû³Æ/ || $2 ~ /^¦WºÙ/ || +- $2 ~ /^NOME/ || $2 ~ /^NAAM/ || $2 ~ /^ÈÌÅ/)) || ++ $2 ~ MAN_NAME )) || + (pages == "cat" && $1 ~ /^NAME/)) { + if (!insh) { + insh = 1; +@@ -278,6 +295,7 @@ + if ($1 ~ /^\.[Ss][HhYS]/ || + (pages == "cat" && + ($1 ~ /^S[yYeE]/ || $1 ~ /^DESCRIPTION/ || ++ $1 ~ MAN_DESCRIPTION || + $1 ~ /^COMMAND/ || $1 ~ /^OVERVIEW/ || + $1 ~ /^STRUCTURES/ || $1 ~ /^INTRODUCTION/ || + $0 ~ /^[^ ]/))) { diff --git a/meta/recipes-extended/man/man-1.6e/man-1.6e-lzma+xz-support.patch b/meta/recipes-extended/man/man-1.6e/man-1.6e-lzma+xz-support.patch new file mode 100644 index 0000000000..9aa5260b71 --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.6e-lzma+xz-support.patch @@ -0,0 +1,142 @@ +diff -Naurp man-1.6e/configure man-1.6e.oden/configure +--- man-1.6e/configure 2008-12-21 19:20:51.000000000 +0100 ++++ man-1.6e.oden/configure 2008-12-21 19:20:32.000000000 +0100 +@@ -1027,7 +1027,7 @@ then + then + DO_COMPRESSION=true + compress= +- for i in bzip2 gzip bzip tzip pack compress freeze yabba ++ for i in xz lzma bzip2 gzip bzip tzip pack compress freeze yabba + do + eval F$i=missing + for j in $DEFPATH +@@ -1080,6 +1080,8 @@ then + fi + + case $compress in ++ *xz*) ext=".xz" ;; ++ *lzma*) ext=".lzma" ;; + *bzip2*) ext=".bz2" ;; + *gzip*) ext=".gz" ;; + *bzip*) ext=".bz" ;; +@@ -1122,7 +1124,7 @@ then + fi + + # unconditionally handle uncompression +-UNCOMPRESSORS="gunzip bzip2 pcat zcat fcat unyabba" ++UNCOMPRESSORS="unxz unlzma gunzip bzip2 pcat zcat fcat unyabba" + for i in $UNCOMPRESSORS + do + eval F$i=missing +@@ -1143,6 +1146,14 @@ bzip2=missing + if [ $Fbzip2 != missing ]; then + bzip2="$Fbzip2 -c -d" + fi ++unxz=missing ++if [ $Funxz != missing ]; then ++ unxz="$Funxz -c -d" ++fi ++unlzma=missing ++if [ $Funlzma != missing ]; then ++ unlzma="$Funlzma -c -d" ++fi + pcat="$Fpcat" + zcat="$Fzcat" + fcat="$Ffcat" +@@ -1171,6 +1181,12 @@ if [ x$default = x ]; then + bzip2) + echo "Command to use for .bz2 files (standard bzip2)" + echo $n "[`eval echo \\$$filter`] $c" ;; ++ xz) ++ echo "Command to use for .xz files (standard xz)" ++ echo $n "[`eval echo \\$$filter`] $c" ;; ++ lzma) ++ echo "Command to use for .lzma files (standard lzma)" ++ echo $n "[`eval echo \\$$filter`] $c" ;; + pcat) + echo "Command to use for .z files (pack/unpack)" + echo $n "[`eval echo \\$$filter`] $c" ;; +@@ -1232,6 +1248,8 @@ fi + case $compress_ext in + .gz) decompress=$gunzip ;; + .bz2) decompress=$bzip2 ;; ++ .xz) decompress=$unlzma ;; ++ .lzma) decompress=$unlzma ;; + .z) decompress=$pcat ;; + .Z) decompress=$zcat ;; + .F) decompress=$fcat ;; +@@ -1319,6 +1337,8 @@ s,@pcat@,$pcat, + s,@zcat@,$zcat, + s,@gunzip@,$gunzip, + s,@bzip2@,$bzip2, ++s,@unlzma@,$unlzma, ++s,@unxz@,$unxz, + s,@unyabba@,$unyabba, + s,@compress@,$compress, + s,@compress_ext@,$compress_ext, +diff -Naurp man-1.6e/src/makewhatis.sh man-1.6e.oden/src/makewhatis.sh +--- man-1.6e/src/makewhatis.sh 2008-12-21 19:20:51.000000000 +0100 ++++ man-1.6e.oden/src/makewhatis.sh 2008-12-21 19:20:32.000000000 +0100 +@@ -220,7 +220,7 @@ do + find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | LC_ALL=C $AWK -v MAN_NAME="$MAN_NAME" -v MAN_DESCRIPTION="$MAN_DESCRIPTION" ' + + function readline() { +- if (use_zcat || use_bzcat) { ++ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) { + result = (pipe_cmd | getline); + if (result < 0) { + print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr"; +@@ -235,7 +235,7 @@ do + } + + function closeline() { +- if (use_zcat || use_bzcat) { ++ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) { + return close(pipe_cmd); + } else { + return close(filename); +@@ -254,7 +254,11 @@ do + match(filename,"\\.z$") || match(filename,"\\.gz$"); + if (!use_zcat) + use_bzcat = match(filename,"\\.bz2"); +- if (use_zcat || use_bzcat) { ++ if(!use_bzcat) ++ use_lzcat = match(filename,"\\.lzma"); ++ if(!use_lzcat) ++ use_xzcat = match(filename,"\\.xz"); ++ if (use_zcat || use_bzcat || use_lzcat || use_xz_cat) { + filename_no_gz = substr(filename, 0, RSTART - 1); + } else { + filename_no_gz = filename; +@@ -267,12 +271,16 @@ do + actual_section = section; + } + sub(/\..*/, "", progname); +- if (use_zcat || use_bzcat) { ++ if (use_zcat || use_bzcat || use_lzcat || use_xz_cat) { + if (use_zcat) { + pipe_cmd = "zcat \"" filename "\""; +- } else { ++ } else if (use_bzcat) { + pipe_cmd = "bzcat \"" filename "\""; +- } ++ } else if (use_lzcat) { ++ pipe_cmd = "lzcat \"" filename "\""; ++ } else { ++ pipe_cmd = "xzcat \"" filename "\""; ++ } + # try to avoid suspicious stuff + if (filename ~ /[;&|`$(]/) { + print "ignored strange file name " filename " in " curdir > "/dev/stderr"; +diff -Naurp man-1.6e/src/man.conf.in man-1.6e.oden/src/man.conf.in +--- man-1.6e/src/man.conf.in 2008-12-21 19:20:51.000000000 +0100 ++++ man-1.6e.oden/src/man.conf.in 2008-12-21 19:20:32.000000000 +0100 +@@ -139,6 +139,8 @@ MANSECT @sections@ + # + .gz @gunzip@ + .bz2 @bzip2@ ++.lzma @unlzma@ ++.xz @unxz@ + .z @pcat@ + .Z @zcat@ + .F @fcat@ diff --git a/meta/recipes-extended/man/man-1.6e/man-1.6e-mandirs.patch b/meta/recipes-extended/man/man-1.6e/man-1.6e-mandirs.patch new file mode 100644 index 0000000000..06e9869754 --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.6e-mandirs.patch @@ -0,0 +1,27 @@ +--- man-1.6e.orig/src/man.conf.in 2005-08-20 20:26:06.000000000 -0300 ++++ man-1.6e/src/man.conf.in 2007-05-18 10:30:29.000000000 -0300 +@@ -36,11 +36,12 @@ + # + # Every automatically generated MANPATH includes these fields + # +-MANPATH /usr/man + MANPATH /usr/share/man ++MANPATH /usr/X11R6/man + MANPATH /usr/local/man + MANPATH /usr/local/share/man +-MANPATH /usr/X11R6/man ++MANPATH /usr/kerberos/man ++MANPATH /usr/man + # + # Uncomment if you want to include one of these by default + # +@@ -67,6 +68,9 @@ + MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man + MANPATH_MAP /usr/bin/X11 /usr/X11R6/man + MANPATH_MAP /usr/bin/mh /usr/share/man ++MANPATH_MAP /usr/kerberos/bin /usr/kerberos/man ++MANPATH_MAP /usr/kerberos/sbin /usr/kerberos/man ++ + # + # NOAUTOPATH keeps man from automatically adding directories that look like + # manual page directories to the path. diff --git a/meta/recipes-extended/man/man-1.6e/man-1.6e-new_sections.patch b/meta/recipes-extended/man/man-1.6e/man-1.6e-new_sections.patch new file mode 100644 index 0000000000..51727588f4 --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.6e-new_sections.patch @@ -0,0 +1,11 @@ +--- man-1.6e.orig/configure 2006-05-01 14:56:14.000000000 -0300 ++++ man-1.6e/configure 2007-05-18 14:35:43.000000000 -0300 +@@ -960,7 +960,7 @@ + + # What sections do we anticipate? + +-tmpsections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o" ++tmpsections="1 1p 8 2 3 3p 3pm 4 5 6 7 9 0p tcl n l p o" + + if [ x$default = x ]; then + echo "" diff --git a/meta/recipes-extended/man/man-1.6e/man-1.6e-ro_usr.patch b/meta/recipes-extended/man/man-1.6e/man-1.6e-ro_usr.patch new file mode 100644 index 0000000000..054054b521 --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.6e-ro_usr.patch @@ -0,0 +1,67 @@ +--- man-1.6e.orig/src/makewhatis.sh 2006-07-19 01:58:08.000000000 -0300 ++++ man-1.6e/src/makewhatis.sh 2007-05-18 10:54:57.000000000 -0300 +@@ -124,7 +124,7 @@ + continue;; + -s) setsections=1 + continue;; +- -u) findarg="-ctime 0" ++ -u) findarg="-newer /var/cache/man/whatis" + update=1 + continue;; + -v) verbose=1 +@@ -165,14 +165,7 @@ + # first truncate all the whatis files that will be created new, + # then only update - we might visit the same directory twice + if [ x$update = x ]; then +- for pages in man cat +- do +- eval path="\$$pages"path +- for mandir in $path +- do +- cp /dev/null $mandir/whatis +- done +- done ++ cp /dev/null /var/cache/man/whatis + fi + + for pages in man cat +@@ -184,11 +177,6 @@ + if [ x$verbose != x ]; then + echo "about to enter $mandir" > /dev/stderr + fi +- if [ -s ${mandir}/whatis -a $pages = man -a x$update = x ]; then +- if [ x$verbose != x ]; then +- echo skipping $mandir - we did it already > /dev/stderr +- fi +- else + here=`pwd` + cd $mandir + for i in $sections +@@ -407,23 +395,14 @@ + + cd $here + +- # kludge for Slackware's /usr/man/preformat +- if [ $mandir = /usr/man/preformat ] +- then +- mandir1=/usr/man +- else +- mandir1=$mandir +- fi +- +- if [ -f ${mandir1}/whatis ] ++ if [ -f /var/cache/man/whatis ] + then +- cat ${mandir1}/whatis >> $TMPFILE ++ cat /var/cache/man/whatis >> $TMPFILE + fi +- tr -s '\n' < $TMPFILE | sort -u > ${mandir1}/whatis ++ tr -s '\n' < $TMPFILE | sort -u > /var/cache/man/whatis + +- chmod 644 ${mandir1}/whatis ++ chmod 644 /var/cache/man/whatis + rm $TMPFILE +- fi + done + done + diff --git a/meta/recipes-extended/man/man-1.6e/man-1.6e-security.patch b/meta/recipes-extended/man/man-1.6e/man-1.6e-security.patch new file mode 100644 index 0000000000..85fdf4e5fc --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.6e-security.patch @@ -0,0 +1,58 @@ +diff -Naur man-1.6e.orig/src/makewhatis.sh man-1.6e/src/makewhatis.sh +--- man-1.6e.orig/src/makewhatis.sh 2006-07-19 01:58:08.000000000 -0300 ++++ man-1.6e/src/makewhatis.sh 2007-05-18 10:18:31.000000000 -0300 +@@ -45,7 +45,7 @@ + # and should be first. + # It is a bug to add /var/cache/man to DEFCATPATH. + dm= +-for d in /usr/man /usr/share/man /usr/X11R6/man /usr/local/man ++for d in /usr/share/man /usr/man /usr/X11R6/man /usr/local/man + do + if [ -d $d ]; then + if [ x$dm = x ]; then dm=$d; else dm=$dm:$d; fi +@@ -53,7 +53,7 @@ + done + DEFMANPATH=$dm + dc= +-for d in /usr/man/preformat /usr/man /usr/share/man/preformat /usr/share/man ++for d in /var/cache/man /usr/share/man/preformat /usr/man/preformat /usr/share/man /usr/man + do + if [ -d $d ]; then + if [ x$dc = x ]; then dc=$d; else dc=$dc:$d; fi +@@ -76,12 +76,12 @@ + # We try here to be careful (and avoid preconstructed symlinks) + # in case makewhatis is run as root, by creating a subdirectory of /tmp. + +-TMPFILEDIR=/tmp/whatis.tmp.dir.$$ +-rm -rf $TMPFILEDIR +-if ! mkdir -m 0700 $TMPFILEDIR; then +- echo Could not create $TMPFILEDIR +- exit 1; ++TMPFILEDIR=`mktemp -d /tmp/makewhatisXXXXXX` ++if [ $? -ne 0 ]; then ++ echo "$0: Can't create temp file, exiting..." ++ exit 1 + fi ++chmod 0700 $TMPFILEDIR + TMPFILE=$TMPFILEDIR/w + + # make sure TMPFILEDIR is deleted if program is killed or terminates +diff -Naur man-1.6e.orig/src/man.c man-1.6e/src/man.c +--- man-1.6e.orig/src/man.c 2006-05-01 17:34:22.000000000 -0300 ++++ man-1.6e/src/man.c 2007-05-18 10:11:33.000000000 -0300 +@@ -1234,7 +1234,6 @@ + #endif + + +-#if 0 + { + /* There are no known cases of buffer overflow caused by + excessively long environment variables. In case you find one, +@@ -1257,7 +1256,6 @@ + MAN_ICONV_PATH, MAN_ICONV_OPT, MAN_ICONV_INPUT_CHARSET, + MAN_ICONV_OUTPUT_CHARSET, NLSPATH, PATH */ + } +-#endif + + + #ifndef __FreeBSD__ diff --git a/meta/recipes-extended/man/man-1.6e/man-1.6e-use_i18n_vars_in_a_std_way.patch b/meta/recipes-extended/man/man-1.6e/man-1.6e-use_i18n_vars_in_a_std_way.patch new file mode 100644 index 0000000000..a448da54d7 --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.6e-use_i18n_vars_in_a_std_way.patch @@ -0,0 +1,156 @@ +diff -Naur man-1.6e.orig/catopen/catopen.c man-1.6e/catopen/catopen.c +--- man-1.6e.orig/catopen/catopen.c 2005-08-20 20:26:06.000000000 -0300 ++++ man-1.6e/catopen/catopen.c 2007-05-18 11:31:05.000000000 -0300 +@@ -9,22 +9,63 @@ + extern char *index (const char *, int); /* not always in */ + extern char *my_malloc(int); /* in util.c */ + ++/* if the program has sgid/suid privileges then getenv doesn't return ++ * NLSPATH; so we set here a good default value. ++ */ + #ifndef DEFAULT_NLSPATH + # if __GLIBC__ >= 2 +-# define DEFAULT_NLSPATH "/usr/share/locale/%L/%N" ++# define DEFAULT_NLSPATH "/usr/share/locale/%L/%N:/usr/share/locale/%l_%t/%N:/usr/share/locale/%l/%N" + # else + # define DEFAULT_NLSPATH "/usr/lib/locale/%N/%L" + # endif + #endif + +-static nl_catd my_catopenpath(char *name, char *path); ++static nl_catd my_catopenpath(char *name, char *path, char *lang); + + static /* this source included in gripes.c */ + nl_catd + my_catopen(char *name, int oflag) { +- nl_catd fd; ++ nl_catd fd = (nl_catd) -1; ++ ++ /* using first the my_catopenpath, which looks with LANGUAGE ++ * and only if it fails ressort to catopen, it gives better i18n ++ */ ++ { ++ char *nlspath, *lang, *s; + +- fd = catopen(name, oflag); ++ /* ++ * "If NLSPATH does not exist in the environment, or if a ++ * message catalog cannot be opened in any of the paths specified ++ * by NLSPATH, then an implementation defined default path is used" ++ */ ++ nlspath = getenv("NLSPATH"); ++ if (!nlspath) ++ nlspath = DEFAULT_NLSPATH; ++ ++ lang = getenv("LANGUAGE"); ++ if (!lang) ++ lang = getenv("LC_ALL"); ++ if (!lang) ++ lang = getenv("LC_MESSAGES"); ++ if (!lang) ++ lang = getenv("LANG"); ++ if (!lang) ++ lang = ""; ++ ++ while(*lang && (fd == (nl_catd) -1)) { ++ s = index(lang, ':'); ++ if (s) *s = 0; ++ fd = my_catopenpath(name, nlspath, lang); ++ if (s) lang=s+1; ++ else lang = ""; ++ } ++ if (fd == (nl_catd) -1) ++ fd = my_catopenpath(name, nlspath, "en"); ++ } ++ ++ /* still not found, use the system catopen */ ++ if (fd == (nl_catd) -1) ++ fd = catopen(name, oflag); + + if (fd == (nl_catd) -1 && oflag) { + oflag = 0; +@@ -32,8 +73,6 @@ + } + + if (fd == (nl_catd) -1) { +- char *nlspath; +- + /* The libc catopen fails - let us see if we can do better */ + /* The quotes below are from X/Open, XPG 1987, Vol. 3. */ + +@@ -58,17 +97,6 @@ + #endif + } + +- /* +- * "If NLSPATH does not exist in the environment, or if a +- * message catalog cannot be opened in any of the paths specified +- * by NLSPATH, then an implementation defined default path is used" +- */ +- +- nlspath = getenv("NLSPATH"); +- if (nlspath) +- fd = my_catopenpath(name, nlspath); +- if (fd == (nl_catd) -1) +- fd = my_catopenpath(name, DEFAULT_NLSPATH); + } + return fd; + } +@@ -90,15 +118,13 @@ + * + */ + static nl_catd +-my_catopenpath(char *name, char *nlspath) { +- int fd; ++my_catopenpath(char *name, char *nlspath, char *lang) { + nl_catd cfd = (nl_catd) -1; +- char *path0, *path, *s, *file, *lang, *lang_l, *lang_t, *lang_c; ++ char *path0, *path, *s, *file, *lang_l, *lang_t, *lang_c; + int langsz, namesz, sz, lang_l_sz, lang_t_sz, lang_c_sz; + + namesz = strlen(name); + +- lang = getenv("LANG"); + if (!lang) + lang = ""; + langsz = strlen(lang); +@@ -194,14 +220,9 @@ + path = s+1; + } else + path = 0; +- fd = open(file, O_RDONLY); +- if (fd != -1) { +- /* we found the right catalog - but we don't know the +- type of nl_catd, so close it again and ask libc */ +- close(fd); +- cfd = catopen(file, 0); +- break; +- } ++ cfd = catopen(file, 0); ++ if (cfd != (nl_catd) -1) ++ break; + } + + free(path0); +diff -Naur man-1.6e.orig/src/manpath.c man-1.6e/src/manpath.c +--- man-1.6e.orig/src/manpath.c 2006-08-03 18:18:33.000000000 -0300 ++++ man-1.6e/src/manpath.c 2007-05-18 11:02:48.000000000 -0300 +@@ -282,13 +282,14 @@ + /* We cannot use "lang = setlocale(LC_MESSAGES, NULL)" or so: + the return value of setlocale is an opaque string. */ + /* POSIX prescribes the order: LC_ALL, LC_MESSAGES, LANG */ +- if((lang = getenv("LC_ALL")) != NULL) ++ /* LANGUAGE is GNU/Linux and overrules all */ ++ if((lang = getenv("LANGUAGE")) != NULL) + split2(dir, lang, add_to_mandirlist_x, perrs); +- if((lang = getenv("LC_MESSAGES")) != NULL) ++ else if((lang = getenv("LC_ALL")) != NULL) + split2(dir, lang, add_to_mandirlist_x, perrs); +- if((lang = getenv("LANG")) != NULL) ++ else if((lang = getenv("LC_MESSAGES")) != NULL) + split2(dir, lang, add_to_mandirlist_x, perrs); +- if((lang = getenv("LANGUAGE")) != NULL) ++ else if((lang = getenv("LANG")) != NULL) + split2(dir, lang, add_to_mandirlist_x, perrs); + add_to_mandirlist_x(dir, 0, perrs); + } diff --git a/meta/recipes-extended/man/man-1.6e/man-1.6e-whatis2.patch b/meta/recipes-extended/man/man-1.6e/man-1.6e-whatis2.patch new file mode 100644 index 0000000000..180d4a3178 --- /dev/null +++ b/meta/recipes-extended/man/man-1.6e/man-1.6e-whatis2.patch @@ -0,0 +1,37 @@ +--- man-1.6e-ro_usr/src/makewhatis.sh 2007-05-18 11:41:50.000000000 -0300 ++++ man-1.6e/src/makewhatis.sh 2007-05-18 13:27:16.000000000 -0300 +@@ -162,10 +162,15 @@ + fi + catpath=`echo ${catpath} | tr : ' '` + ++#WHATIS_DIR=$DESTDIR/var/cache/man/`echo $here|sed -e 's!.*/man/!!g'` ++WHATIS_DIR=$DESTDIR/var/cache/man/$LANG ++[[ -d $WHATIS_DIR ]] || mkdir -p $WHATIS_DIR/ ++ + # first truncate all the whatis files that will be created new, + # then only update - we might visit the same directory twice + if [ x$update = x ]; then +- cp /dev/null /var/cache/man/whatis ++ mkdir -p $WHATIS_DIR/ ++ /bin/echo -n > $WHATIS_DIR/whatis + fi + + for pages in man cat +@@ -395,13 +400,13 @@ + + cd $here + +- if [ -f /var/cache/man/whatis ] ++ if [ -f $WHATIS_DIR/whatis ] + then +- cat /var/cache/man/whatis >> $TMPFILE ++ cat $WHATIS_DIR/whatis >> $TMPFILE + fi +- tr -s '\n' < $TMPFILE | sort -u > /var/cache/man/whatis ++ tr -s '\n' < $TMPFILE | sort -u > $WHATIS_DIR/whatis + +- chmod 644 /var/cache/man/whatis ++ chmod 644 $WHATIS_DIR/whatis + rm $TMPFILE + done + done diff --git a/meta/recipes-extended/man/man-1.6e/man.1.gz b/meta/recipes-extended/man/man-1.6e/man.1.gz new file mode 100644 index 0000000000000000000000000000000000000000..c368045153406ab730aad35bfc7ffd91238bd47d GIT binary patch literal 12323 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 J#~S#D004`l-XQ=0 literal 0 HcmV?d00001 diff --git a/meta/recipes-extended/man/man-1.6e/man.7.gz b/meta/recipes-extended/man/man-1.6e/man.7.gz new file mode 100644 index 0000000000000000000000000000000000000000..e85af82426507521badb6f5c425896385f469b5a GIT binary patch literal 6192 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 literal 0 HcmV?d00001 diff --git a/meta/recipes-extended/man/man-1.6e/manpath.5.gz b/meta/recipes-extended/man/man-1.6e/manpath.5.gz new file mode 100644 index 0000000000000000000000000000000000000000..c012ff89763bb057afaaaed3b616244748354fec GIT binary patch literal 2133 zcmV-b2&(rViwFP!000021HD&WZ`(K)eb=wJ$Sg21;3#oBZIkZH=BufJ#tC8PMNDJd%r{}rO9GNXDW zsSvsn^(szEov9_Iq85~?Tt@NyfdA;StTsk1S2Z184rp|C_S=v@-_VT_vXJy8rY|ao z(KMz*{uK|N+4t(?WHjW@ckc5P%em6@Mbx&`ad+6)vVlh%N|mjRS~Rt!MyJv^S8Hhs z+xmSo`Aj!bOCxf+Zx*>qoPkd&k=jZUmTV;xl_{AL4&p5w7G2)me;rS5@BkPjWg#uC zRlVXDoB`l*lrDM))V6z5?72&7dUZyl*Y8ix-oGBv&F##gLJkICa1#eS{v~B>8)M`q z7D?QEACNN=#T9&=eWcs-$^ALL-_XIUlhMi1$*ZH$+XMV3eiOgL_pz*#<6VB>#`Ggi z&Tp@yut4*pJw~6|78u3WtLy3I!}xwSzMDj|o__N0HAZm29w}w1u|RLJX@$}NYbPVX zlB-%t8`UMCw$i$Hjs3MXXbBFP2EeOA4hgR*ovK8D(Dh0st8H`9N`Xd`;LFlsYhXaa zNZz=>r;*s1I#xHfmIZBZ5jw?t5&Td~$8-Vuj7;j%@Ul1ILSgw^eyo=SUtF9vj-s(g zPU=TxN?k}@)1xp-EEu(i3;IXPRRmB(4sX&8Sy>O=Hl;lQj2v*Rh0-{SRR!Ta$HrRa zd8A7)_9%@}DNNL{qvylj!|nOZF_V>fUar|wXgEiNn~GxvCJAdw*ZGDJWVzG|p}mKq z?xXl(Oux{ab$%b*jA%R~tzHYA$5WFQlfBf6zaZ#c8Z zfnAji00~gXKucMNDPt7&DxKs_3iieiblh0O6wr?IYznU5!|iRK|56a3o|-DS<$Qwv zcAYFlRRLqD>jRLNB3Z$gos*)hY;;$gIDLM#TPA798}^-PX%cBFS@phdZJ!*XoM#uz z(1i~%8}Avyqlfv=KjuGq4SeiCkUh}+=fD4yy)KDEvcH_FZK1M5r=zmsJaHVYSCY4_ zq%wUrQeYRRI8#}1j^92BxG+`1KqXBs40BynrKtsiQW=XG2f93Eni`c-Wy+-y#gKhE z#G$&yJk*k>wJ&-uYq7p^ok;lIl{81p+Ho;g9ye?CMb7$gFch1G-~_Rrn9zjC;Q~!$Z--fp`>yFx*w&_`wPrF zy7@sLrqkKvDq>u|%gq|IhpP$yX%`Z(()K{$=OSkR@K_`@Yo&7l0Db0uRyP`w%{Rl~ zzm}{_0T25C*a3(s>Sf32FDazEufZ%)kz;madq{sS>HI8g^7W&aT&K8W+c$CX)6+L+Bi7-$ebS+Q^bY~+mabm(51ovo9FrxFBFb3I5AL0{;)#{ZQc@b`0rqPI*B1Li zq#*xXll&oy%8zDz@(x^Ekw-;i{cwxjaQVeHcy;|@Jh?^(glgt2#YR3?^;4NKM1``6 z%rR2Pvax$ruN{}{KT);3ISrUBRjsISqzRU9A<=S{Jo2%f?SVuDP<0t-Y?XPOmR{fOdT{8(R>D$oPNp z{3riI@=gB)$6jX;-A+pgrnZ`3WF?D-3zr{KQ4W2ntv zCdT`F=V`37C|IHqY0Bx8UegJ^!p-D2I-|GrE{ZdScdy+ZI8wlds&e^)6YSveHxL4LDJQRrq01;5K0d zcTpQ@yX#Tw3U(}HUSdQ8(@t6>vy79kE8Jl=-QZH{s=t++9Tobd;FCBhp;;R4#7wg8Fm-|ewfUMEJSRi9kX_aXS52xWAzQO}1G+V9-zLNbP L!Vpl2a}xjn5ok8& literal 0 HcmV?d00001 diff --git a/meta/recipes-extended/man/man_1.6e.bb b/meta/recipes-extended/man/man_1.6e.bb new file mode 100644 index 0000000000..1ac10979d9 --- /dev/null +++ b/meta/recipes-extended/man/man_1.6e.bb @@ -0,0 +1,61 @@ +DESCRIPTION = "A set of documentation tools: man, apropos and whatis" +SECTION = "console/utils" +HOMEPAGE = "http://primates.ximian.com/~flucifredi/man" +PRIORITY = "required" +LICENSE = "GPLv2" +PR = "r0" + +DEPENDS = "groff less" + +LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" + +SRC_URI = "http://primates.ximian.com/~flucifredi/man/man-1.6e.tar.gz \ + file://man-1.5k-confpath.patch;striplevel=0 \ + file://man-1.5h1-make.patch;striplevel=1 \ + file://man-1.5k-nonascii.patch;striplevel=1 \ + file://man-1.6e-security.patch;striplevel=1 \ + file://man-1.6e-mandirs.patch;striplevel=1 \ + file://man-1.5m2-bug11621.patch;striplevel=1 \ + file://man-1.5k-sofix.patch;striplevel=1 \ + file://man-1.5m2-buildroot.patch;striplevel=1 \ + file://man-1.6e-ro_usr.patch;striplevel=1 \ + file://man-1.5i2-newline.patch;striplevel=0 \ + file://man-1.5j-utf8.patch;striplevel=1 \ + file://man-1.5i2-overflow.patch;striplevel=1 \ + file://man-1.5j-nocache.patch;striplevel=1 \ + file://man-1.5i2-initial.patch;striplevel=1 \ + file://man-1.5h1-gencat.patch;striplevel=0 \ + file://man-1.5g-nonrootbuild.patch;striplevel=1 \ + file://man-1.5m2-tv_fhs.patch;striplevel=0 \ + file://man-1.5j-i18n.patch;striplevel=1 \ + file://man-1.6e-whatis2.patch;striplevel=1 \ + file://man-1.6e-use_i18n_vars_in_a_std_way.patch;striplevel=1 \ + file://man-1.5m2-no-color-for-printing.patch;striplevel=1 \ + file://man-1.5m2-sigpipe.patch;striplevel=1 \ + file://man-1.6e-i18n_whatis.patch;striplevel=1 \ + file://man-1.6e-new_sections.patch;striplevel=1 \ + file://man-1.6e-lzma+xz-support.patch;striplevel=1 \ + file://man*" + + +do_configure () { + ${S}/configure -default -confdir ${D}/etc +sgid +fhs +lang all +} + + +fakeroot do_install() { + oe_runmake install DESTDIR=${D} +} + +do_install_append(){ + mkdir -p ${D}/etc/ + mkdir -p ${D}${datadir}/man/man5 + mkdir -p ${D}${datadir}/man/man7 + cp ${S}/src/man.conf ${D}/etc/ + cp ${WORKDIR}/man.1.gz ${D}${datadir}/man/man1/ + cp ${WORKDIR}/man.7.gz ${D}${datadir}/man/man7/ + cp ${WORKDIR}/manpath.5.gz ${D}${datadir}/man/man5/ +} + + +FILES_${PN} += "${datadir}/locale" -- 2.40.1