summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/man
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/man')
-rw-r--r--meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch16
-rw-r--r--meta/recipes-extended/man/man/man-1.5h1-gencat.patch14
-rw-r--r--meta/recipes-extended/man/man/man-1.5h1-make.patch17
-rw-r--r--meta/recipes-extended/man/man/man-1.5i2-initial.patch19
-rw-r--r--meta/recipes-extended/man/man/man-1.5i2-newline.patch15
-rw-r--r--meta/recipes-extended/man/man/man-1.5i2-overflow.patch16
-rw-r--r--meta/recipes-extended/man/man/man-1.5j-i18n.patch16
-rw-r--r--meta/recipes-extended/man/man/man-1.5j-nocache.patch16
-rw-r--r--meta/recipes-extended/man/man/man-1.5j-utf8.patch61
-rw-r--r--meta/recipes-extended/man/man/man-1.5k-confpath.patch15
-rw-r--r--meta/recipes-extended/man/man/man-1.5k-nonascii.patch18
-rw-r--r--meta/recipes-extended/man/man/man-1.5k-sofix.patch24
-rw-r--r--meta/recipes-extended/man/man/man-1.5m2-bug11621.patch15
-rw-r--r--meta/recipes-extended/man/man/man-1.5m2-buildroot.patch52
-rw-r--r--meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch15
-rw-r--r--meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch30
-rw-r--r--meta/recipes-extended/man/man/man-1.5m2-tv_fhs.patch31
-rw-r--r--meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch145
-rw-r--r--meta/recipes-extended/man/man/man-1.6e-mandirs.patch31
-rw-r--r--meta/recipes-extended/man/man/man-1.6e-new_sections.patch15
-rw-r--r--meta/recipes-extended/man/man/man-1.6e-ro_usr.patch33
-rw-r--r--meta/recipes-extended/man/man/man-1.6e-security.patch62
-rw-r--r--meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch160
-rw-r--r--meta/recipes-extended/man/man/man-1.6e-whatis2.patch52
-rw-r--r--meta/recipes-extended/man/man/man.1.gzbin0 -> 12323 bytes
-rw-r--r--meta/recipes-extended/man/man/man.7.gzbin0 -> 6192 bytes
-rw-r--r--meta/recipes-extended/man/man/man.conf141
-rw-r--r--meta/recipes-extended/man/man/manpath.5.gzbin0 -> 2133 bytes
-rw-r--r--meta/recipes-extended/man/man_1.6g.bb79
29 files changed, 1108 insertions, 0 deletions
diff --git a/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch b/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
new file mode 100644
index 0000000000..6f834bd01b
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
@@ -0,0 +1,16 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5diff -u -r man-1.5g.old/configure man-1.5g/configure
6--- man-1.5g.old/configure Wed Apr 7 04:16:05 1999
7+++ man-1.5g/configure Mon May 15 15:22:44 2000
8@@ -791,7 +791,7 @@
9 read mode
10 if test "$mode" != ""; then man_mode=$mode; fi
11 fi
12- man_install_flags="-m $man_mode -o $man_user -g $man_group"
13+ man_install_flags=""
14 fi
15
16 # What sections do we anticipate?
diff --git a/meta/recipes-extended/man/man/man-1.5h1-gencat.patch b/meta/recipes-extended/man/man/man-1.5h1-gencat.patch
new file mode 100644
index 0000000000..044b14c509
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.5h1-gencat.patch
@@ -0,0 +1,14 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5--- gencat/genlib.c 2006-08-02 20:11:44.000000000 +0200
6+++ gencat/genlib.c.oden 2008-12-21 19:18:50.000000000 +0100
7@@ -47,6 +47,7 @@ up-to-date. Many thanks.
8 01/14/91 4 nazgul Off by one on number specified entries
9 */
10
11+#undef _GNU_SOURCE
12 #include <stdio.h>
13 #include <stdlib.h>
14 #ifdef SYSV
diff --git a/meta/recipes-extended/man/man/man-1.5h1-make.patch b/meta/recipes-extended/man/man/man-1.5h1-make.patch
new file mode 100644
index 0000000000..8631eb2c53
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.5h1-make.patch
@@ -0,0 +1,17 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5--- man-1.5g/man/Makefile.in.mike Fri Apr 9 13:35:54 1999
6+++ man-1.5g/man/Makefile.in Fri Apr 9 13:36:45 1999
7@@ -1,8 +1,8 @@
8 # only executed from a subdir
9 MAN1 = man whatis apropos
10-MAN5 = man.conf
11+MAN5 = man.config
12 MAN8 = makewhatis
13-ALL = man.1 whatis.1 apropos.1 man.conf.5
14+ALL = man.1 whatis.1 apropos.1 man.config.5
15 MAYBE8 = makewhatis
16
17 .SUFFIXES: .man .1 .5 .8
diff --git a/meta/recipes-extended/man/man/man-1.5i2-initial.patch b/meta/recipes-extended/man/man/man-1.5i2-initial.patch
new file mode 100644
index 0000000000..fe56c0706c
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.5i2-initial.patch
@@ -0,0 +1,19 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5--- man-1.5i2/src/makewhatis.sh.initial Tue Jul 3 15:38:39 2001
6+++ man-1.5i2/src/makewhatis.sh Tue Jul 3 15:39:39 2001
7@@ -81,8 +81,10 @@
8 continue;;
9 -s) setsections=1
10 continue;;
11- -u) findarg="-newer /var/cache/man/whatis"
12- update=1
13+ -u) if [ -e /var/cache/man/whatis ]; then
14+ findarg="-newer /var/cache/man/whatis"
15+ update=1
16+ fi
17 continue;;
18 -v) verbose=1
19 continue;;
diff --git a/meta/recipes-extended/man/man/man-1.5i2-newline.patch b/meta/recipes-extended/man/man/man-1.5i2-newline.patch
new file mode 100644
index 0000000000..611df5d259
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.5i2-newline.patch
@@ -0,0 +1,15 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5--- src/man.c 2008-12-21 19:17:31.000000000 +0100
6+++ src/man.c.oden 2008-12-21 19:17:38.000000000 +0100
7@@ -391,7 +391,7 @@ again:
8 beg++;
9
10 end = beg;
11- while (*end != ' ' && *end != '\t' && *end != '\n' && *end != '\0')
12+ while (*end != ' ' && *end != '\t' && *end != '\n' && *end != '\0' && (end-buf)<BUFSIZE)
13 end++; /* note that buf is NUL-terminated */
14 *end = '\0';
15
diff --git a/meta/recipes-extended/man/man/man-1.5i2-overflow.patch b/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
new file mode 100644
index 0000000000..52d2881a89
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
@@ -0,0 +1,16 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5--- man-1.5i2/src/man.c.overflow Mon Jun 25 00:01:45 2001
6+++ man-1.5i2/src/man.c Mon Jun 25 00:01:45 2001
7@@ -381,6 +381,9 @@
8 strcat(name, "/");
9 strcat(name, beg);
10 }
11+ /* If this is too long, bad things have already happened. *
12+ * we should quit IMMEDIATELY. */
13+ if(strlen(name)>sizeof(ultname)) _exit(1);
14
15 goto again;
16 }
diff --git a/meta/recipes-extended/man/man/man-1.5j-i18n.patch b/meta/recipes-extended/man/man/man-1.5j-i18n.patch
new file mode 100644
index 0000000000..2ae09c0ea4
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.5j-i18n.patch
@@ -0,0 +1,16 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5--- man-1.5j/msgs/inst.sh.i18n Wed Apr 25 10:40:50 2001
6+++ man-1.5j/msgs/inst.sh Wed Apr 25 10:41:17 2001
7@@ -27,8 +27,7 @@
8 for j in $M; do
9 if [ -f $j ]; then
10 i=`echo $j | sed -e 's/mess.//; s/.cat//'`
11- dest=`echo $locdir | sed -e "s/%N/man/; s/%L/$i/"`
12- dest=${PREFIX}$dest
13+ dest=${PREFIX}/`echo $locdir | sed -e "s/%N/man/; s/%L/$i/"`
14 echo "mkdir -p `dirname $dest`"
15 mkdir -p `dirname $dest`;
16 echo "install -c -m 644 $j $dest"
diff --git a/meta/recipes-extended/man/man/man-1.5j-nocache.patch b/meta/recipes-extended/man/man/man-1.5j-nocache.patch
new file mode 100644
index 0000000000..751dddd53b
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.5j-nocache.patch
@@ -0,0 +1,16 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5--- man-1.5j/src/man.conf.in.nocache Thu Nov 22 15:07:12 2001
6+++ man-1.5j/src/man.conf.in Thu Nov 22 15:07:12 2001
7@@ -81,6 +81,9 @@
8 #
9 #NOCACHE
10 #
11+# NOCACHE keeps man from creating cache pages
12+NOCACHE
13+#
14 # Useful paths - note that COL should not be defined when
15 # NROFF is defined as "groff -Tascii" or "groff -Tlatin1";
16 # not only is it superfluous, but it actually damages the output.
diff --git a/meta/recipes-extended/man/man/man-1.5j-utf8.patch b/meta/recipes-extended/man/man/man-1.5j-utf8.patch
new file mode 100644
index 0000000000..33d3e4c974
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.5j-utf8.patch
@@ -0,0 +1,61 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5--- man-1.5j/configure.utf8 Thu Nov 22 15:02:35 2001
6+++ man-1.5j/configure Thu Nov 22 15:03:15 2001
7@@ -408,9 +408,9 @@
8 Fgawk=/bin/gawk
9 Fawk=/bin/gawk
10 Fmawk=missing
11- troff=""
12- nroff=""
13- jnroff=""
14+ troff=/usr/bin/troff
15+ nroff=/usr/bin/nroff
16+ jnroff=/usr/bin/nroff
17 eqn=""
18 neqn=""
19 jneqn=""
20@@ -453,6 +453,8 @@
21 done
22 done
23 Fgroff=/usr/bin/groff
24+ Fnroff=/usr/bin/nroff
25+ Fjnroff=/usr/bin/nroff
26 Fgeqn=/usr/bin/geqn
27 Fgtbl=/usr/bin/gtbl
28 Fcol=/usr/bin/col
29@@ -485,25 +487,25 @@
30 then
31 if test $Fnroff = "missing"
32 then
33- nroff="nroff -Tlatin1 -mandoc"
34+ nroff="nroff -Tutf8 -mandoc"
35 else
36- nroff="$Fnroff -Tlatin1 -mandoc"
37+ nroff="$Fnroff -Tutf8 -mandoc"
38 fi
39 troff="troff -mandoc"
40 echo "Warning: could not find groff"
41 else
42 if test $Fnroff = "missing"
43 then
44- nroff="$Fgroff -Tlatin1 -mandoc"
45+ nroff="$Fgroff -Tutf8 -mandoc"
46 else
47- nroff="$Fnroff -Tlatin1 -mandoc"
48+ nroff="$Fnroff -Tutf8 -mandoc"
49 fi
50 troff="$Fgroff -Tps -mandoc"
51- jnroff="$Fgroff -Tnippon -mandocj"
52+ jnroff="$Fjnroff -Tutf8 -mandocj"
53 fi
54 eqn="$Fgeqn -Tps"
55- neqn="$Fgeqn -Tlatin1"
56- jneqn="$Fgeqn -Tnippon"
57+ neqn="$Fgeqn -Tutf8"
58+ jneqn="$Fgeqn -Tutf8"
59 tbl="$Fgtbl"
60 col="$Fcol"
61 vgrind="$Fvgrind"
diff --git a/meta/recipes-extended/man/man/man-1.5k-confpath.patch b/meta/recipes-extended/man/man/man-1.5k-confpath.patch
new file mode 100644
index 0000000000..b5746c2df8
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.5k-confpath.patch
@@ -0,0 +1,15 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5--- configure 2006-05-01 19:56:14.000000000 +0200
6+++ configure.oden 2008-12-21 19:16:50.000000000 +0100
7@@ -198,7 +198,7 @@
8 confdir="${confprefix}/share/misc"
9 fi
10 fi
11-conffilename="man.conf"
12+conffilename="man.config"
13
14 if test "$RANDOM" = "$RANDOM"; then
15 # Plain old Bourne shell.
diff --git a/meta/recipes-extended/man/man/man-1.5k-nonascii.patch b/meta/recipes-extended/man/man/man-1.5k-nonascii.patch
new file mode 100644
index 0000000000..d662d9b6a7
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.5k-nonascii.patch
@@ -0,0 +1,18 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5--- ./src/apropos.sh.nonascii 2001-11-23 00:30:42.000000000 +0100
6+++ ./src/apropos.sh 2002-08-13 15:44:53.000000000 +0200
7@@ -18,9 +18,9 @@
8
9 # When man pages in your favorite locale look to grep like binary files
10 # (and you use GNU grep) you may want to add the 'a' option to *grepopt1.
11-aproposgrepopt1='i'
12+aproposgrepopt1='ia'
13 aproposgrepopt2=''
14-whatisgrepopt1='iw'
15+whatisgrepopt1='iwa'
16 whatisgrepopt2='^'
17 grepopt1=$%apropos_or_whatis%grepopt1
18 grepopt2=$%apropos_or_whatis%grepopt2
diff --git a/meta/recipes-extended/man/man/man-1.5k-sofix.patch b/meta/recipes-extended/man/man/man-1.5k-sofix.patch
new file mode 100644
index 0000000000..50b925288e
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.5k-sofix.patch
@@ -0,0 +1,24 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5--- man-1.5j/src/man.c.sofix Thu Nov 22 14:51:44 2001
6+++ man-1.5j/src/man.c Thu Nov 22 14:52:44 2001
7@@ -300,7 +300,7 @@
8
9 if (strlen(name0) >= sizeof(ultname))
10 return name0;
11- strcpy(ultname, name0);
12+ strncpy(ultname, name0, BUFSIZE-32);
13 name = ultname;
14
15 again:
16@@ -332,7 +332,7 @@
17 * .so files - we could glob for all possible extensions,
18 * for now: only try .gz
19 */
20- else if (fp == NULL && get_expander(".gz") &&
21+ if (fp == NULL && get_expander(".gz") &&
22 strlen(name)+strlen(".gz") < BUFSIZE) {
23 strcat(name, ".gz");
24 fp = fopen (name, "r");
diff --git a/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch b/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
new file mode 100644
index 0000000000..051299906b
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
@@ -0,0 +1,15 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5--- ./configure.ad 2003-12-11 19:17:10.000000000 +0100
6+++ ./configure 2003-12-11 19:17:27.000000000 +0100
7@@ -26,7 +26,7 @@
8 # (Indeed, -r may cause the terminal to get into funny states.
9 # Very inconvenient. For viewing pages in strange locales, set LC_*.)
10 #
11-DEFAULTLESSOPT="-is"
12+DEFAULTLESSOPT="-isr"
13 #
14 # Note that not creating any cat directories (/var/cache/man or so)
15 # and not making man suid or sgid is recommended.
diff --git a/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch b/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
new file mode 100644
index 0000000000..bc97f56b9a
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
@@ -0,0 +1,52 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5--- ./configure.less 2003-12-11 19:18:15.000000000 +0100
6+++ ./configure 2003-12-11 19:20:03.000000000 +0100
7@@ -401,18 +401,13 @@
8
9 if test "$ans" = "false"
10 then
11- for i in more less cmp cat awk gawk mawk
12- do
13- eval F$i="missing"
14- for j in $DEFPATH
15- do
16- if test -f $j/$i
17- then
18- eval F$i=$j/$i
19- break
20- fi
21- done
22- done
23+ Fmore=/bin/more
24+ Fless=/usr/bin/less
25+ Fcmp=/usr/bin/cmp
26+ Fcat=/bin/cat
27+ Fgawk=/bin/gawk
28+ Fawk=/bin/gawk
29+ Fmawk=missing
30 troff=""
31 nroff=""
32 jnroff=""
33@@ -457,6 +452,19 @@
34 fi
35 done
36 done
37+ Fgroff=/usr/bin/groff
38+ Fgeqn=/usr/bin/geqn
39+ Fgtbl=/usr/bin/gtbl
40+ Fcol=/usr/bin/col
41+ Fgrefer=/usr/bin/grefer
42+ Fgpic=/usr/bin/gpic
43+ Fmore=/bin/more
44+ Fless=/usr/bin/less
45+ Fcmp=/usr/bin/cmp
46+ Fcat=/bin/cat
47+ Fgawk=/bin/gawk
48+
49+
50 for i in eqn tbl refer pic
51 do
52 if test `eval echo \\$Fg$i` = "missing"
diff --git a/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch b/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
new file mode 100644
index 0000000000..c85ff1d8c7
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
@@ -0,0 +1,15 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5--- man-1.5m2/configure.color 2006-09-16 18:27:37.000000000 +0200
6+++ man-1.5m2/configure 2006-09-16 18:28:44.000000000 +0200
7@@ -539,6 +539,8 @@
8 troff="$troff -c"
9 nroff="$nroff -c"
10 jnroff="$jnroff -c"
11+else
12+ troff="$troff -c"
13 fi
14
15 if [ x$default = x ]; then
diff --git a/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch b/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
new file mode 100644
index 0000000000..8af78eab7b
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
@@ -0,0 +1,30 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5--- man-1.5m2/src/util.c_sigpipe 2006-12-09 13:43:21.000000000 +0100
6+++ man-1.5m2/src/util.c 2006-12-09 13:53:13.000000000 +0100
7@@ -116,11 +116,14 @@
8 static int
9 system1 (const char *command) {
10 void (*prev_handler)(int) = signal (SIGINT,catch_int);
11+ signal (SIGPIPE,SIG_IGN);
12 int ret = system(command);
13
14 /* child terminated with signal? */
15 if (WIFSIGNALED(ret) &&
16- (WTERMSIG(ret) == SIGINT || WTERMSIG(ret) == SIGQUIT))
17+ (WTERMSIG(ret) == SIGINT ||
18+ WTERMSIG(ret) == SIGPIPE ||
19+ WTERMSIG(ret) == SIGQUIT))
20 exit(1);
21
22 /* or we caught an interrupt? */
23@@ -128,6 +131,7 @@
24 exit(1);
25
26 signal(SIGINT,prev_handler);
27+ signal(SIGPIPE,SIG_DFL);
28 return ret;
29 }
30
diff --git a/meta/recipes-extended/man/man/man-1.5m2-tv_fhs.patch b/meta/recipes-extended/man/man/man-1.5m2-tv_fhs.patch
new file mode 100644
index 0000000000..fe66d7599a
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.5m2-tv_fhs.patch
@@ -0,0 +1,31 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5--- man/Makefile.in 2008-12-21 19:19:33.000000000 +0100
6+++ man/Makefile.in.oden 2008-12-21 19:19:39.000000000 +0100
7@@ -34,6 +34,15 @@
8 for i in $(MAN8); \
9 do if test -f $$i.8; then $(INSTALL) $$i.8 $(mandir)/man8/$$i.@man8ext@; fi; done
10
11+install-l10n: $(ALL)
12+ mkdir -p $(mandir)/$(SLANG)/man1 $(mandir)/$(SLANG)/man5 $(mandir)/$(SLANG)/man8
13+ for i in $(MAN1); \
14+ do $(INSTALL) $$i.1 $(mandir)/$(SLANG)/man1/$$i.@man1ext@; done
15+ for i in $(MAN5); \
16+ do $(INSTALL) $$i.5 $(mandir)/$(SLANG)/man5/$$i.@man5ext@; done
17+ for i in $(MAN8); \
18+ do if test -f $$i.8; then $(INSTALL) $$i.8 $(mandir)/$(SLANG)/man8/$$i.@man8ext@; fi; done
19+
20 clean:
21 rm -f core *.in *.@man1ext@ *.@man5ext@ *.@man8ext@ *~
22
23@@ -49,7 +58,7 @@
24 @for i in @languages@; do if test -d $$i; then echo; \
25 echo "==== Installing the `cat $$i.txt` man pages. ===="; \
26 cd $$i; SLANG=/$$i; if test $$SLANG = /en; then SLANG= ; fi; \
27- export SLANG; make -f ../Makefile install; cd ..; \
28+ export SLANG; make -f ../Makefile install-l10n; cd ..; \
29 else echo "==== No $$i man pages found. ===="; fi; done
30
31 cleansubdirs:
diff --git a/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch b/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
new file mode 100644
index 0000000000..e321325d63
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
@@ -0,0 +1,145 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5diff -Naur man-1.6e.orig/src/apropos.sh man-1.6e/src/apropos.sh
6--- man-1.6e.orig/src/apropos.sh 2007-05-18 13:49:31.000000000 -0300
7+++ man-1.6e/src/apropos.sh 2007-05-18 14:24:33.000000000 -0300
8@@ -60,16 +60,56 @@
9 esac
10 done
11
12+# list of languages to look for
13+LANG_LIST=`echo $LANGUAGE:$LC_ALL:$LC_MESSAGES:$LANG | tr ':' ' '`
14+DIR_LIST=""
15+for d in /var/cache/man $manpath /usr/lib
16+do
17+ for l in $LANG_LIST
18+ do
19+ if [ -d $d/$l ]
20+ then
21+ # check that the path is not already in the list
22+ if ! echo "$DIR_LIST" | grep " $d/$l\b" > /dev/null
23+ then
24+ DIR_LIST="$DIR_LIST $d/$l"
25+ fi
26+ fi
27+ done
28+ DIR_LIST="$DIR_LIST $d"
29+ # check that the path is not already in the list
30+ if ! echo "$DIR_LIST" | grep " $d\b" > /dev/null
31+ then
32+ DIR_LIST="$DIR_LIST $d/$l"
33+ fi
34+done
35+
36 while [ "$1" != "" ]
37 do
38 found=0
39- for d in /var/cache/man $manpath /usr/lib
40+ # in order not to display lines in more than one language for
41+ # a same man page; we check that a given man page name
42+ # hasn't already been displayed
43+ BAZ=""
44+ for d in $DIR_LIST
45 do
46 if [ -f $d/whatis ]
47 then
48- if grep -"$grepopt1" "$grepopt2""$1" $d/whatis
49+ if FOO=`grep -"$grepopt1" "$grepopt2""$1" $d/whatis`
50 then
51- found=1
52+ # the LC_ALL=C is needed in case the text is
53+ # in a different encoding than the locale
54+ BAR=`echo -e "$FOO" | LC_ALL=C sed 's/ - .*$//' | tr ' []' '_' | sort -u`
55+ for i in $BAR
56+ do
57+ if ! echo "$BAZ" | grep "$i" > /dev/null
58+ then
59+ BAZ="$BAZ $i"
60+ i="^`echo $i | sed 's:_\+:\\\(\[_ \]\\\|\\\[\\\|\\\]\\\)\\\+:g'`"
61+ echo -e "$FOO" | grep "$i"
62+ found=1
63+ fi
64+ done
65 # Some people are satisfied with a single occurrence
66 # But it is better to give all
67 # break
68diff -Naur man-1.6e.orig/src/makewhatis.sh man-1.6e/src/makewhatis.sh
69--- man-1.6e.orig/src/makewhatis.sh 2007-05-18 13:49:31.000000000 -0300
70+++ man-1.6e/src/makewhatis.sh 2007-05-18 13:50:07.000000000 -0300
71@@ -41,12 +41,32 @@
72
73 program=`basename $0`
74
75+# this allows to define language specific values fro NAME, DESCRIPTION
76+# if not defined, using those default values
77+if [ -z "$MAN_NAME" ]
78+then
79+ MAN_NAME="ИМЕ|NOM|JMÉNO|NAVN|ΟÎΟΜΑ|NOMBRE|NIME|IZENA|NIMI|IME|\
80+NÉV|NOME|åå‰|ì´ë¦„|NAAM|NAZWA|NUME|ИМЯ|MENO|ÐÐЗВÐ|å称|å稱"
81+fi
82+if [ -z "$MAN_DESCRIPTION" ]
83+then
84+ MAN_DESCRIPTION="ОПИСÐÐИЕ|DESCRIPCIÓ|POPIS|BESKRIVELSE|BESCHREIBUNG|\
85+ΠΕΡΙΓΡΑΦΗ|DESCRIPCIÓN|KIRJELDUS|AZALPENA|KUVAUS|OPIS|LEÃRÃS|DESCRIZIONE|\
86+説明|설명|BESCHRIJVING|DESCRIÇÃO|DESCRIERE|ОПИС|æè¿°"
87+fi
88+# make them into awk regexp
89+MAN_NAME="^(${MAN_NAME})";
90+MAN_DESCRIPTION="^(${MAN_DESCRIPTION})";
91+
92 # In case both /usr/man and /usr/share/man exist, the former is local
93 # and should be first.
94 # It is a bug to add /var/cache/man to DEFCATPATH.
95 dm=
96 for d in /usr/share/man /usr/man /usr/X11R6/man /usr/local/man
97 do
98+ if [ -n "$LANG" -a -d "$d/$LANG" ]; then
99+ if [ x$dm = x ]; then dm="$d/$LANG"; else dm=$dm:"$d/$LANG"; fi
100+ fi
101 if [ -d $d ]; then
102 if [ x$dm = x ]; then dm=$d; else dm=$dm:$d; fi
103 fi
104@@ -55,6 +75,9 @@
105 dc=
106 for d in /var/cache/man /usr/share/man/preformat /usr/man/preformat /usr/share/man /usr/man
107 do
108+ if [ -n "$LANG" -a -d "$d/$LANG" ]; then
109+ if [ x$dc = x ]; then dm="$d/$LANG"; else dm=$dc:"$d/$LANG"; fi
110+ fi
111 if [ -d $d ]; then
112 if [ x$dc = x ]; then dc=$d; else dc=$dc:$d; fi
113 fi
114@@ -194,7 +217,7 @@
115 section=$i
116 curdir=$mandir/${pages}$i
117 export section verbose curdir
118- find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK '
119+ find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | LC_ALL=C $AWK -v MAN_NAME="$MAN_NAME" -v MAN_DESCRIPTION="$MAN_DESCRIPTION" '
120
121 function readline() {
122 if (use_zcat || use_bzcat) {
123@@ -261,13 +284,7 @@
124 gsub(/.\b/, "");
125 if (($1 ~ /^\.[Ss][Hh]/ &&
126 ($2 ~ /[Nn][Aa][Mm][Ee]/ ||
127- $2 ~ /^JMÉNO/ || $2 ~ /^NAVN/ || $2 ~ /^NUME/ ||
128- $2 ~ /^BEZEICHNUNG/ || $2 ~ /^NOMBRE/ ||
129- $2 ~ /^NIMI/ || $2 ~ /^NOM/ || $2 ~ /^IME/ ||
130- $2 ~ /^N[ÉE]V/ || $2 ~ /^NAMA/ || $2 ~ /^̾Á°/ ||
131- $2 ~ /^̾¾Î/ || $2 ~ /^À̸§/ || $2 ~ /^NAZWA/ ||
132- $2 ~ /^îáú÷áîéå/ || $2 ~ /^Ãû³Æ/ || $2 ~ /^¦WºÙ/ ||
133- $2 ~ /^NOME/ || $2 ~ /^NAAM/ || $2 ~ /^ÈÌÅ/)) ||
134+ $2 ~ MAN_NAME )) ||
135 (pages == "cat" && $1 ~ /^NAME/)) {
136 if (!insh) {
137 insh = 1;
138@@ -278,6 +295,7 @@
139 if ($1 ~ /^\.[Ss][HhYS]/ ||
140 (pages == "cat" &&
141 ($1 ~ /^S[yYeE]/ || $1 ~ /^DESCRIPTION/ ||
142+ $1 ~ MAN_DESCRIPTION ||
143 $1 ~ /^COMMAND/ || $1 ~ /^OVERVIEW/ ||
144 $1 ~ /^STRUCTURES/ || $1 ~ /^INTRODUCTION/ ||
145 $0 ~ /^[^ ]/))) {
diff --git a/meta/recipes-extended/man/man/man-1.6e-mandirs.patch b/meta/recipes-extended/man/man/man-1.6e-mandirs.patch
new file mode 100644
index 0000000000..b240064c98
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.6e-mandirs.patch
@@ -0,0 +1,31 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5--- man-1.6e.orig/src/man.conf.in 2005-08-20 20:26:06.000000000 -0300
6+++ man-1.6e/src/man.conf.in 2007-05-18 10:30:29.000000000 -0300
7@@ -36,11 +36,12 @@
8 #
9 # Every automatically generated MANPATH includes these fields
10 #
11-MANPATH /usr/man
12 MANPATH /usr/share/man
13+MANPATH /usr/X11R6/man
14 MANPATH /usr/local/man
15 MANPATH /usr/local/share/man
16-MANPATH /usr/X11R6/man
17+MANPATH /usr/kerberos/man
18+MANPATH /usr/man
19 #
20 # Uncomment if you want to include one of these by default
21 #
22@@ -67,6 +68,9 @@
23 MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man
24 MANPATH_MAP /usr/bin/X11 /usr/X11R6/man
25 MANPATH_MAP /usr/bin/mh /usr/share/man
26+MANPATH_MAP /usr/kerberos/bin /usr/kerberos/man
27+MANPATH_MAP /usr/kerberos/sbin /usr/kerberos/man
28+
29 #
30 # NOAUTOPATH keeps man from automatically adding directories that look like
31 # manual page directories to the path.
diff --git a/meta/recipes-extended/man/man/man-1.6e-new_sections.patch b/meta/recipes-extended/man/man/man-1.6e-new_sections.patch
new file mode 100644
index 0000000000..fb9773c646
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.6e-new_sections.patch
@@ -0,0 +1,15 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5--- man-1.6e.orig/configure 2006-05-01 14:56:14.000000000 -0300
6+++ man-1.6e/configure 2007-05-18 14:35:43.000000000 -0300
7@@ -960,7 +960,7 @@
8
9 # What sections do we anticipate?
10
11-tmpsections="1 1p 8 2 3 3p 4 5 6 7 9 0p tcl n l p o"
12+tmpsections="1 1p 8 2 3 3p 3pm 4 5 6 7 9 0p tcl n l p o"
13
14 if [ x$default = x ]; then
15 echo ""
diff --git a/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch b/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
new file mode 100644
index 0000000000..1d1cb0c724
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
@@ -0,0 +1,33 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5Index: man-1.6f/src/makewhatis.sh
6===================================================================
7--- man-1.6f.orig/src/makewhatis.sh 2010-12-29 13:42:34.000000000 -0800
8+++ man-1.6f/src/makewhatis.sh 2010-12-29 13:42:35.667428347 -0800
9@@ -124,7 +124,7 @@
10 continue;;
11 -s) setsections=1
12 continue;;
13- -u) findarg="-ctime 0"
14+ -u) findarg="-newer /var/cache/man/whatis"
15 update=1
16 continue;;
17 -v) verbose=1
18@@ -165,14 +165,7 @@
19 # first truncate all the whatis files that will be created new,
20 # then only update - we might visit the same directory twice
21 if [ x$update = x ]; then
22- for pages in man cat
23- do
24- eval path="\$$pages"path
25- for mandir in $path
26- do
27- cp /dev/null $mandir/whatis
28- done
29- done
30+ cp /dev/null /var/cache/man/whatis
31 fi
32
33 for pages in man cat
diff --git a/meta/recipes-extended/man/man/man-1.6e-security.patch b/meta/recipes-extended/man/man/man-1.6e-security.patch
new file mode 100644
index 0000000000..312a882f06
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.6e-security.patch
@@ -0,0 +1,62 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5diff -Naur man-1.6e.orig/src/makewhatis.sh man-1.6e/src/makewhatis.sh
6--- man-1.6e.orig/src/makewhatis.sh 2006-07-19 01:58:08.000000000 -0300
7+++ man-1.6e/src/makewhatis.sh 2007-05-18 10:18:31.000000000 -0300
8@@ -45,7 +45,7 @@
9 # and should be first.
10 # It is a bug to add /var/cache/man to DEFCATPATH.
11 dm=
12-for d in /usr/man /usr/share/man /usr/X11R6/man /usr/local/man
13+for d in /usr/share/man /usr/man /usr/X11R6/man /usr/local/man
14 do
15 if [ -d $d ]; then
16 if [ x$dm = x ]; then dm=$d; else dm=$dm:$d; fi
17@@ -53,7 +53,7 @@
18 done
19 DEFMANPATH=$dm
20 dc=
21-for d in /usr/man/preformat /usr/man /usr/share/man/preformat /usr/share/man
22+for d in /var/cache/man /usr/share/man/preformat /usr/man/preformat /usr/share/man /usr/man
23 do
24 if [ -d $d ]; then
25 if [ x$dc = x ]; then dc=$d; else dc=$dc:$d; fi
26@@ -76,12 +76,12 @@
27 # We try here to be careful (and avoid preconstructed symlinks)
28 # in case makewhatis is run as root, by creating a subdirectory of /tmp.
29
30-TMPFILEDIR=/tmp/whatis.tmp.dir.$$
31-rm -rf $TMPFILEDIR
32-if ! mkdir -m 0700 $TMPFILEDIR; then
33- echo Could not create $TMPFILEDIR
34- exit 1;
35+TMPFILEDIR=`mktemp -d /tmp/makewhatisXXXXXX`
36+if [ $? -ne 0 ]; then
37+ echo "$0: Can't create temp file, exiting..."
38+ exit 1
39 fi
40+chmod 0700 $TMPFILEDIR
41 TMPFILE=$TMPFILEDIR/w
42
43 # make sure TMPFILEDIR is deleted if program is killed or terminates
44diff -Naur man-1.6e.orig/src/man.c man-1.6e/src/man.c
45--- man-1.6e.orig/src/man.c 2006-05-01 17:34:22.000000000 -0300
46+++ man-1.6e/src/man.c 2007-05-18 10:11:33.000000000 -0300
47@@ -1234,7 +1234,6 @@
48 #endif
49
50
51-#if 0
52 {
53 /* There are no known cases of buffer overflow caused by
54 excessively long environment variables. In case you find one,
55@@ -1257,7 +1256,6 @@
56 MAN_ICONV_PATH, MAN_ICONV_OPT, MAN_ICONV_INPUT_CHARSET,
57 MAN_ICONV_OUTPUT_CHARSET, NLSPATH, PATH */
58 }
59-#endif
60
61
62 #ifndef __FreeBSD__
diff --git a/meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch b/meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch
new file mode 100644
index 0000000000..568f742100
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch
@@ -0,0 +1,160 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5diff -Naur man-1.6e.orig/catopen/catopen.c man-1.6e/catopen/catopen.c
6--- man-1.6e.orig/catopen/catopen.c 2005-08-20 20:26:06.000000000 -0300
7+++ man-1.6e/catopen/catopen.c 2007-05-18 11:31:05.000000000 -0300
8@@ -9,22 +9,63 @@
9 extern char *index (const char *, int); /* not always in <string.h> */
10 extern char *my_malloc(int); /* in util.c */
11
12+/* if the program has sgid/suid privileges then getenv doesn't return
13+ * NLSPATH; so we set here a good default value.
14+ */
15 #ifndef DEFAULT_NLSPATH
16 # if __GLIBC__ >= 2
17-# define DEFAULT_NLSPATH "/usr/share/locale/%L/%N"
18+# define DEFAULT_NLSPATH "/usr/share/locale/%L/%N:/usr/share/locale/%l_%t/%N:/usr/share/locale/%l/%N"
19 # else
20 # define DEFAULT_NLSPATH "/usr/lib/locale/%N/%L"
21 # endif
22 #endif
23
24-static nl_catd my_catopenpath(char *name, char *path);
25+static nl_catd my_catopenpath(char *name, char *path, char *lang);
26
27 static /* this source included in gripes.c */
28 nl_catd
29 my_catopen(char *name, int oflag) {
30- nl_catd fd;
31+ nl_catd fd = (nl_catd) -1;
32+
33+ /* using first the my_catopenpath, which looks with LANGUAGE
34+ * and only if it fails ressort to catopen, it gives better i18n
35+ */
36+ {
37+ char *nlspath, *lang, *s;
38
39- fd = catopen(name, oflag);
40+ /*
41+ * "If NLSPATH does not exist in the environment, or if a
42+ * message catalog cannot be opened in any of the paths specified
43+ * by NLSPATH, then an implementation defined default path is used"
44+ */
45+ nlspath = getenv("NLSPATH");
46+ if (!nlspath)
47+ nlspath = DEFAULT_NLSPATH;
48+
49+ lang = getenv("LANGUAGE");
50+ if (!lang)
51+ lang = getenv("LC_ALL");
52+ if (!lang)
53+ lang = getenv("LC_MESSAGES");
54+ if (!lang)
55+ lang = getenv("LANG");
56+ if (!lang)
57+ lang = "";
58+
59+ while(*lang && (fd == (nl_catd) -1)) {
60+ s = index(lang, ':');
61+ if (s) *s = 0;
62+ fd = my_catopenpath(name, nlspath, lang);
63+ if (s) lang=s+1;
64+ else lang = "";
65+ }
66+ if (fd == (nl_catd) -1)
67+ fd = my_catopenpath(name, nlspath, "en");
68+ }
69+
70+ /* still not found, use the system catopen */
71+ if (fd == (nl_catd) -1)
72+ fd = catopen(name, oflag);
73
74 if (fd == (nl_catd) -1 && oflag) {
75 oflag = 0;
76@@ -32,8 +73,6 @@
77 }
78
79 if (fd == (nl_catd) -1) {
80- char *nlspath;
81-
82 /* The libc catopen fails - let us see if we can do better */
83 /* The quotes below are from X/Open, XPG 1987, Vol. 3. */
84
85@@ -58,17 +97,6 @@
86 #endif
87 }
88
89- /*
90- * "If NLSPATH does not exist in the environment, or if a
91- * message catalog cannot be opened in any of the paths specified
92- * by NLSPATH, then an implementation defined default path is used"
93- */
94-
95- nlspath = getenv("NLSPATH");
96- if (nlspath)
97- fd = my_catopenpath(name, nlspath);
98- if (fd == (nl_catd) -1)
99- fd = my_catopenpath(name, DEFAULT_NLSPATH);
100 }
101 return fd;
102 }
103@@ -90,15 +118,13 @@
104 *
105 */
106 static nl_catd
107-my_catopenpath(char *name, char *nlspath) {
108- int fd;
109+my_catopenpath(char *name, char *nlspath, char *lang) {
110 nl_catd cfd = (nl_catd) -1;
111- char *path0, *path, *s, *file, *lang, *lang_l, *lang_t, *lang_c;
112+ char *path0, *path, *s, *file, *lang_l, *lang_t, *lang_c;
113 int langsz, namesz, sz, lang_l_sz, lang_t_sz, lang_c_sz;
114
115 namesz = strlen(name);
116
117- lang = getenv("LANG");
118 if (!lang)
119 lang = "";
120 langsz = strlen(lang);
121@@ -194,14 +220,9 @@
122 path = s+1;
123 } else
124 path = 0;
125- fd = open(file, O_RDONLY);
126- if (fd != -1) {
127- /* we found the right catalog - but we don't know the
128- type of nl_catd, so close it again and ask libc */
129- close(fd);
130- cfd = catopen(file, 0);
131- break;
132- }
133+ cfd = catopen(file, 0);
134+ if (cfd != (nl_catd) -1)
135+ break;
136 }
137
138 free(path0);
139diff -Naur man-1.6e.orig/src/manpath.c man-1.6e/src/manpath.c
140--- man-1.6e.orig/src/manpath.c 2006-08-03 18:18:33.000000000 -0300
141+++ man-1.6e/src/manpath.c 2007-05-18 11:02:48.000000000 -0300
142@@ -282,13 +282,14 @@
143 /* We cannot use "lang = setlocale(LC_MESSAGES, NULL)" or so:
144 the return value of setlocale is an opaque string. */
145 /* POSIX prescribes the order: LC_ALL, LC_MESSAGES, LANG */
146- if((lang = getenv("LC_ALL")) != NULL)
147+ /* LANGUAGE is GNU/Linux and overrules all */
148+ if((lang = getenv("LANGUAGE")) != NULL)
149 split2(dir, lang, add_to_mandirlist_x, perrs);
150- if((lang = getenv("LC_MESSAGES")) != NULL)
151+ else if((lang = getenv("LC_ALL")) != NULL)
152 split2(dir, lang, add_to_mandirlist_x, perrs);
153- if((lang = getenv("LANG")) != NULL)
154+ else if((lang = getenv("LC_MESSAGES")) != NULL)
155 split2(dir, lang, add_to_mandirlist_x, perrs);
156- if((lang = getenv("LANGUAGE")) != NULL)
157+ else if((lang = getenv("LANG")) != NULL)
158 split2(dir, lang, add_to_mandirlist_x, perrs);
159 add_to_mandirlist_x(dir, 0, perrs);
160 }
diff --git a/meta/recipes-extended/man/man/man-1.6e-whatis2.patch b/meta/recipes-extended/man/man/man-1.6e-whatis2.patch
new file mode 100644
index 0000000000..7f013836c0
--- /dev/null
+++ b/meta/recipes-extended/man/man/man-1.6e-whatis2.patch
@@ -0,0 +1,52 @@
1Upstream-Status: Pending
2
3Signed-off-by: Scott Garman <scott.a.garman@intel.com>
4
5Index: man-1.6f/src/makewhatis.sh
6===================================================================
7--- man-1.6f.orig/src/makewhatis.sh 2010-12-29 13:51:45.000000000 -0800
8+++ man-1.6f/src/makewhatis.sh 2010-12-29 13:59:35.399799412 -0800
9@@ -164,10 +164,15 @@
10 fi
11 catpath=`echo ${catpath} | tr : ' '`
12
13+#WHATIS_DIR=$DESTDIR/var/cache/man/`echo $here|sed -e 's!.*/man/!!g'`
14+WHATIS_DIR=$DESTDIR/var/cache/man/$LANG
15+[[ -d $WHATIS_DIR ]] || mkdir -p $WHATIS_DIR/
16+
17 # first truncate all the whatis files that will be created new,
18 # then only update - we might visit the same directory twice
19 if [ x$update = x ]; then
20- cp /dev/null /var/cache/man/whatis
21+ mkdir -p $WHATIS_DIR/
22+ /bin/echo -n > $WHATIS_DIR/whatis
23 fi
24
25 for pages in man cat
26@@ -180,13 +185,7 @@
27 echo "about to enter $mandir" > /dev/stderr
28 fi
29
30- # kludge for Slackware's /usr/man/preformat
31- if [ $mandir = /usr/man/preformat ]
32- then
33- mandir1=/usr/man
34- else
35- mandir1=$mandir
36- fi
37+ mandir1=$WHATIS_DIR
38
39 # if $mandir is on a readonly partition, and the whatis file
40 # is not a symlink, then let's skip trying to update it
41@@ -207,11 +206,6 @@
42 fi
43 fi
44
45- if [ -s ${mandir}/whatis -a $pages = man -a x$update = x ]; then
46- if [ x$verbose != x ]; then
47- echo skipping $mandir - we did it already > /dev/stderr
48- fi
49- else
50 here=`pwd`
51 cd $mandir
52 for i in $sections
diff --git a/meta/recipes-extended/man/man/man.1.gz b/meta/recipes-extended/man/man/man.1.gz
new file mode 100644
index 0000000000..c368045153
--- /dev/null
+++ b/meta/recipes-extended/man/man/man.1.gz
Binary files differ
diff --git a/meta/recipes-extended/man/man/man.7.gz b/meta/recipes-extended/man/man/man.7.gz
new file mode 100644
index 0000000000..e85af82426
--- /dev/null
+++ b/meta/recipes-extended/man/man/man.7.gz
Binary files differ
diff --git a/meta/recipes-extended/man/man/man.conf b/meta/recipes-extended/man/man/man.conf
new file mode 100644
index 0000000000..fc10be2758
--- /dev/null
+++ b/meta/recipes-extended/man/man/man.conf
@@ -0,0 +1,141 @@
1#
2# Generated automatically from man.conf.in by the
3# configure script.
4#
5# man.conf from man-1.5p
6#
7# For more information about this file, see the man pages man(1)
8# and man.conf(5).
9#
10# This file is read by man to configure the default manpath (also used
11# when MANPATH contains an empty substring), to find out where the cat
12# pages corresponding to given man pages should be stored,
13# and to map each PATH element to a manpath element.
14# It may also record the pathname of the man binary. [This is unused.]
15# The format is:
16#
17# MANBIN pathname
18# MANPATH manpath_element [corresponding_catdir]
19# MANPATH_MAP path_element manpath_element
20#
21# If no catdir is given, it is assumed to be equal to the mandir
22# (so that this dir has both man1 etc. and cat1 etc. subdirs).
23# This is the traditional Unix setup.
24# Certain versions of the FSSTND recommend putting formatted versions
25# of /usr/.../man/manx/page.x into /var/catman/.../catx/page.x.
26# The keyword FSSTND will cause this behaviour.
27# Certain versions of the FHS recommend putting formatted versions of
28# /usr/.../share/man/[locale/]manx/page.x into
29# /var/cache/man/.../[locale/]catx/page.x.
30# The keyword FHS will cause this behaviour (and overrides FSSTND).
31# Explicitly given catdirs override.
32#
33# FSSTND
34FHS
35#
36# This file is also read by man in order to find how to call nroff, less, etc.,
37# and to determine the correspondence between extensions and decompressors.
38#
39# MANBIN /usr/local/bin/man
40#
41# Every automatically generated MANPATH includes these fields
42#
43MANPATH /usr/man
44MANPATH /usr/share/man
45MANPATH /usr/local/man
46MANPATH /usr/local/share/man
47MANPATH /usr/X11R6/man
48#
49# Uncomment if you want to include one of these by default
50#
51# MANPATH /opt/*/man
52# MANPATH /usr/lib/*/man
53# MANPATH /usr/share/*/man
54# MANPATH /usr/kerberos/man
55#
56# Set up PATH to MANPATH mapping
57#
58# If people ask for "man foo" and have "/dir/bin/foo" in their PATH
59# and the docs are found in "/dir/man", then no mapping is required.
60#
61# The below mappings are superfluous when the right hand side is
62# in the mandatory manpath already, but will keep man from statting
63# lots of other nearby files and directories.
64#
65MANPATH_MAP /bin /usr/share/man
66MANPATH_MAP /sbin /usr/share/man
67MANPATH_MAP /usr/bin /usr/share/man
68MANPATH_MAP /usr/sbin /usr/share/man
69MANPATH_MAP /usr/local/bin /usr/local/share/man
70MANPATH_MAP /usr/local/sbin /usr/local/share/man
71MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man
72MANPATH_MAP /usr/bin/X11 /usr/X11R6/man
73MANPATH_MAP /usr/bin/mh /usr/share/man
74#
75# NOAUTOPATH keeps man from automatically adding directories that look like
76# manual page directories to the path.
77#
78#NOAUTOPATH
79#
80# NOCACHE keeps man from creating cache pages ("cat pages")
81# (generally one enables/disable cat page creation by creating/deleting
82# the directory they would live in - man never does mkdir)
83#
84#NOCACHE
85#
86# Useful paths - note that COL should not be defined when
87# NROFF is defined as "groff -Tascii" or "groff -Tlatin1";
88# not only is it superfluous, but it actually damages the output.
89# For use with utf-8, NROFF should be "nroff -mandoc" without -T option.
90# (Maybe - but today I need -Tlatin1 to prevent double conversion to utf8.)
91#
92# If you have a new troff (version 1.18.1?) and its colored output
93# causes problems, add the -c option to TROFF, NROFF, JNROFF.
94#
95TROFF /usr/bin/groff -Tps -mandoc
96NROFF /usr/bin/nroff -Tlatin1 -mandoc
97JNROFF /usr/bin/groff -Tnippon -mandocj
98EQN /usr/bin/eqn -Tps
99NEQN /usr/bin/eqn -Tlatin1
100JNEQN /usr/bin/eqn -Tnippon
101TBL /usr/bin/tbl
102# COL /usr/bin/col
103REFER /usr/bin/refer
104PIC /usr/bin/pic
105VGRIND
106GRAP
107PAGER /usr/bin/less -isR
108CAT /bin/cat
109#
110# The command "man -a xyzzy" will show all man pages for xyzzy.
111# When CMP is defined man will try to avoid showing the same
112# text twice. (But compressed pages compare unequal.)
113#
114CMP /usr/bin/cmp -s
115#
116# Compress cat pages
117#
118COMPRESS /bin/bzip2
119COMPRESS_EXT .bz2
120#
121# Default manual sections (and order) to search if -S is not specified
122# and the MANSECT environment variable is not set.
123#
124MANSECT 1:1p:8:2:3:3p:4:5:6:7:9:0p:tcl:n:l:p:o
125#
126# Default options to use when man is invoked without options
127# This is mainly for the benefit of those that think -a should be the default
128# Note that some systems have /usr/man/allman, causing pages to be shown twice.
129#
130#MANDEFOPTIONS -a
131#
132# Decompress with given decompressor when input file has given extension
133# The command given must act as a filter.
134#
135.gz /bin/gunzip -c
136.bz2 /usr/bin/bunzip2 -c
137.xz /usr/bin/unxz -c
138.z
139.Z /bin/zcat
140.F
141.Y
diff --git a/meta/recipes-extended/man/man/manpath.5.gz b/meta/recipes-extended/man/man/manpath.5.gz
new file mode 100644
index 0000000000..c012ff8976
--- /dev/null
+++ b/meta/recipes-extended/man/man/manpath.5.gz
Binary files differ
diff --git a/meta/recipes-extended/man/man_1.6g.bb b/meta/recipes-extended/man/man_1.6g.bb
new file mode 100644
index 0000000000..03fffd6015
--- /dev/null
+++ b/meta/recipes-extended/man/man_1.6g.bb
@@ -0,0 +1,79 @@
1SUMMARY = "Online documentation tools"
2DESCRIPTION = "A set of documentation tools: man, apropos and whatis"
3SECTION = "console/utils"
4HOMEPAGE = "http://primates.ximian.com/~flucifredi/man"
5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
7
8PR = "r1"
9
10DEPENDS = "groff less"
11
12def compress_pkg(d):
13 if "compress_doc" in (d.getVar("INHERIT", True) or "").split():
14 compress = d.getVar("DOC_COMPRESS", True)
15 if compress == "gz":
16 return "gzip"
17 elif compress == "bz2":
18 return "bzip2"
19 elif compress == "xz":
20 return "xz"
21 return ""
22
23RDEPENDS_${PN} += "${@compress_pkg(d)}"
24
25SRC_URI = "http://primates.ximian.com/~flucifredi/${BPN}/${BPN}-${PV}.tar.gz \
26 file://man-1.5k-confpath.patch;striplevel=0 \
27 file://man-1.5h1-make.patch \
28 file://man-1.5k-nonascii.patch \
29 file://man-1.6e-security.patch \
30 file://man-1.6e-mandirs.patch \
31 file://man-1.5m2-bug11621.patch \
32 file://man-1.5k-sofix.patch \
33 file://man-1.5m2-buildroot.patch \
34 file://man-1.6e-ro_usr.patch \
35 file://man-1.5i2-newline.patch;striplevel=0 \
36 file://man-1.5j-utf8.patch \
37 file://man-1.5i2-overflow.patch \
38 file://man-1.5j-nocache.patch \
39 file://man-1.5i2-initial.patch \
40 file://man-1.5h1-gencat.patch;striplevel=0 \
41 file://man-1.5g-nonrootbuild.patch \
42 file://man-1.5m2-tv_fhs.patch;striplevel=0 \
43 file://man-1.5j-i18n.patch \
44 file://man-1.6e-whatis2.patch \
45 file://man-1.6e-use_i18n_vars_in_a_std_way.patch \
46 file://man-1.5m2-no-color-for-printing.patch \
47 file://man-1.5m2-sigpipe.patch \
48 file://man-1.6e-i18n_whatis.patch \
49 file://man-1.6e-new_sections.patch \
50 file://man.1.gz;unpack=false \
51 file://man.7.gz;unpack=false \
52 file://man.conf \
53 file://manpath.5.gz;unpack=false"
54
55SRC_URI[md5sum] = "ba154d5796928b841c9c69f0ae376660"
56SRC_URI[sha256sum] = "ccdcb8c3f4e0080923d7e818f0e4a202db26c46415eaef361387c20995b8959f"
57
58do_configure () {
59 ${S}/configure -default -confdir /etc +sgid +fhs +lang all
60}
61
62
63fakeroot do_install() {
64 oe_runmake install DESTDIR=${D}
65}
66
67do_install_append(){
68 mkdir -p ${D}${sysconfdir}
69 mkdir -p ${D}${datadir}/man/man5
70 mkdir -p ${D}${datadir}/man/man7
71 cp ${WORKDIR}/man.conf ${D}${sysconfdir}/man.config
72 cp ${WORKDIR}/man.1.gz ${D}${datadir}/man/man1/
73 cp ${WORKDIR}/man.7.gz ${D}${datadir}/man/man7/
74 cp ${WORKDIR}/manpath.5.gz ${D}${datadir}/man/man5/
75}
76
77
78RDEPENDS_${PN} = "less groff"
79FILES_${PN} += "${datadir}/locale ${sysconfdir}/man.config"