summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2010-12-29 22:32:25 -0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-30 12:06:52 +0000
commit8494db74786307d44169bee4f21dc0efa1643f70 (patch)
treee98730fc6ed3c971fb5bfd6e8e96b5ef035ddc93
parentc0e6d3ea6a819d5f776d861a8336b18cfab5f316 (diff)
downloadpoky-8494db74786307d44169bee4f21dc0efa1643f70.tar.gz
man: updated to 1.6f, fixed patches
Rebased patches for 1.6f: - lzma - modified for xz support - ro_usr & whatis2 fixed up Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-extended/man/man-1.6e/man-1.6e-lzma+xz-support.patch142
-rw-r--r--meta/recipes-extended/man/man-1.6e/man-1.6e-ro_usr.patch67
-rw-r--r--meta/recipes-extended/man/man-1.6e/man-1.6e-whatis2.patch37
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.5g-nonrootbuild.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.5g-nonrootbuild.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.5h1-gencat.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.5h1-gencat.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.5h1-make.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.5h1-make.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.5i2-initial.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.5i2-initial.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.5i2-newline.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.5i2-newline.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.5i2-overflow.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.5i2-overflow.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.5j-i18n.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.5j-i18n.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.5j-nocache.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.5j-nocache.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.5j-utf8.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.5j-utf8.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.5k-confpath.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.5k-confpath.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.5k-nonascii.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.5k-nonascii.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.5k-sofix.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.5k-sofix.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.5m2-bug11621.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.5m2-bug11621.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.5m2-buildroot.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.5m2-buildroot.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.5m2-multiple.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.5m2-multiple.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.5m2-no-color-for-printing.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.5m2-no-color-for-printing.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.5m2-sigpipe.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.5m2-sigpipe.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.5m2-tv_fhs.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.5m2-tv_fhs.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.6e-i18n_whatis.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.6e-i18n_whatis.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.6e-lzma+xz-support.patch120
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.6e-mandirs.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.6e-mandirs.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.6e-new_sections.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.6e-new_sections.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.6e-ro_usr.patch29
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.6e-security.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.6e-security.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.6e-use_i18n_vars_in_a_std_way.patch (renamed from meta/recipes-extended/man/man-1.6e/man-1.6e-use_i18n_vars_in_a_std_way.patch)0
-rw-r--r--meta/recipes-extended/man/man-1.6f/man-1.6e-whatis2.patch48
-rw-r--r--meta/recipes-extended/man/man-1.6f/man.1.gz (renamed from meta/recipes-extended/man/man-1.6e/man.1.gz)bin12323 -> 12323 bytes
-rw-r--r--meta/recipes-extended/man/man-1.6f/man.7.gz (renamed from meta/recipes-extended/man/man-1.6e/man.7.gz)bin6192 -> 6192 bytes
-rw-r--r--meta/recipes-extended/man/man-1.6f/manpath.5.gz (renamed from meta/recipes-extended/man/man-1.6e/manpath.5.gz)bin2133 -> 2133 bytes
-rw-r--r--meta/recipes-extended/man/man_1.6f.bb (renamed from meta/recipes-extended/man/man_1.6e.bb)6
33 files changed, 200 insertions, 249 deletions
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
deleted file mode 100644
index 9aa5260b71..0000000000
--- a/meta/recipes-extended/man/man-1.6e/man-1.6e-lzma+xz-support.patch
+++ /dev/null
@@ -1,142 +0,0 @@
1diff -Naurp man-1.6e/configure man-1.6e.oden/configure
2--- man-1.6e/configure 2008-12-21 19:20:51.000000000 +0100
3+++ man-1.6e.oden/configure 2008-12-21 19:20:32.000000000 +0100
4@@ -1027,7 +1027,7 @@ then
5 then
6 DO_COMPRESSION=true
7 compress=
8- for i in bzip2 gzip bzip tzip pack compress freeze yabba
9+ for i in xz lzma bzip2 gzip bzip tzip pack compress freeze yabba
10 do
11 eval F$i=missing
12 for j in $DEFPATH
13@@ -1080,6 +1080,8 @@ then
14 fi
15
16 case $compress in
17+ *xz*) ext=".xz" ;;
18+ *lzma*) ext=".lzma" ;;
19 *bzip2*) ext=".bz2" ;;
20 *gzip*) ext=".gz" ;;
21 *bzip*) ext=".bz" ;;
22@@ -1122,7 +1124,7 @@ then
23 fi
24
25 # unconditionally handle uncompression
26-UNCOMPRESSORS="gunzip bzip2 pcat zcat fcat unyabba"
27+UNCOMPRESSORS="unxz unlzma gunzip bzip2 pcat zcat fcat unyabba"
28 for i in $UNCOMPRESSORS
29 do
30 eval F$i=missing
31@@ -1143,6 +1146,14 @@ bzip2=missing
32 if [ $Fbzip2 != missing ]; then
33 bzip2="$Fbzip2 -c -d"
34 fi
35+unxz=missing
36+if [ $Funxz != missing ]; then
37+ unxz="$Funxz -c -d"
38+fi
39+unlzma=missing
40+if [ $Funlzma != missing ]; then
41+ unlzma="$Funlzma -c -d"
42+fi
43 pcat="$Fpcat"
44 zcat="$Fzcat"
45 fcat="$Ffcat"
46@@ -1171,6 +1181,12 @@ if [ x$default = x ]; then
47 bzip2)
48 echo "Command to use for .bz2 files (standard bzip2)"
49 echo $n "[`eval echo \\$$filter`] $c" ;;
50+ xz)
51+ echo "Command to use for .xz files (standard xz)"
52+ echo $n "[`eval echo \\$$filter`] $c" ;;
53+ lzma)
54+ echo "Command to use for .lzma files (standard lzma)"
55+ echo $n "[`eval echo \\$$filter`] $c" ;;
56 pcat)
57 echo "Command to use for .z files (pack/unpack)"
58 echo $n "[`eval echo \\$$filter`] $c" ;;
59@@ -1232,6 +1248,8 @@ fi
60 case $compress_ext in
61 .gz) decompress=$gunzip ;;
62 .bz2) decompress=$bzip2 ;;
63+ .xz) decompress=$unlzma ;;
64+ .lzma) decompress=$unlzma ;;
65 .z) decompress=$pcat ;;
66 .Z) decompress=$zcat ;;
67 .F) decompress=$fcat ;;
68@@ -1319,6 +1337,8 @@ s,@pcat@,$pcat,
69 s,@zcat@,$zcat,
70 s,@gunzip@,$gunzip,
71 s,@bzip2@,$bzip2,
72+s,@unlzma@,$unlzma,
73+s,@unxz@,$unxz,
74 s,@unyabba@,$unyabba,
75 s,@compress@,$compress,
76 s,@compress_ext@,$compress_ext,
77diff -Naurp man-1.6e/src/makewhatis.sh man-1.6e.oden/src/makewhatis.sh
78--- man-1.6e/src/makewhatis.sh 2008-12-21 19:20:51.000000000 +0100
79+++ man-1.6e.oden/src/makewhatis.sh 2008-12-21 19:20:32.000000000 +0100
80@@ -220,7 +220,7 @@ do
81 find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | LC_ALL=C $AWK -v MAN_NAME="$MAN_NAME" -v MAN_DESCRIPTION="$MAN_DESCRIPTION" '
82
83 function readline() {
84- if (use_zcat || use_bzcat) {
85+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
86 result = (pipe_cmd | getline);
87 if (result < 0) {
88 print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr";
89@@ -235,7 +235,7 @@ do
90 }
91
92 function closeline() {
93- if (use_zcat || use_bzcat) {
94+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
95 return close(pipe_cmd);
96 } else {
97 return close(filename);
98@@ -254,7 +254,11 @@ do
99 match(filename,"\\.z$") || match(filename,"\\.gz$");
100 if (!use_zcat)
101 use_bzcat = match(filename,"\\.bz2");
102- if (use_zcat || use_bzcat) {
103+ if(!use_bzcat)
104+ use_lzcat = match(filename,"\\.lzma");
105+ if(!use_lzcat)
106+ use_xzcat = match(filename,"\\.xz");
107+ if (use_zcat || use_bzcat || use_lzcat || use_xz_cat) {
108 filename_no_gz = substr(filename, 0, RSTART - 1);
109 } else {
110 filename_no_gz = filename;
111@@ -267,12 +271,16 @@ do
112 actual_section = section;
113 }
114 sub(/\..*/, "", progname);
115- if (use_zcat || use_bzcat) {
116+ if (use_zcat || use_bzcat || use_lzcat || use_xz_cat) {
117 if (use_zcat) {
118 pipe_cmd = "zcat \"" filename "\"";
119- } else {
120+ } else if (use_bzcat) {
121 pipe_cmd = "bzcat \"" filename "\"";
122- }
123+ } else if (use_lzcat) {
124+ pipe_cmd = "lzcat \"" filename "\"";
125+ } else {
126+ pipe_cmd = "xzcat \"" filename "\"";
127+ }
128 # try to avoid suspicious stuff
129 if (filename ~ /[;&|`$(]/) {
130 print "ignored strange file name " filename " in " curdir > "/dev/stderr";
131diff -Naurp man-1.6e/src/man.conf.in man-1.6e.oden/src/man.conf.in
132--- man-1.6e/src/man.conf.in 2008-12-21 19:20:51.000000000 +0100
133+++ man-1.6e.oden/src/man.conf.in 2008-12-21 19:20:32.000000000 +0100
134@@ -139,6 +139,8 @@ MANSECT @sections@
135 #
136 .gz @gunzip@
137 .bz2 @bzip2@
138+.lzma @unlzma@
139+.xz @unxz@
140 .z @pcat@
141 .Z @zcat@
142 .F @fcat@
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
deleted file mode 100644
index 054054b521..0000000000
--- a/meta/recipes-extended/man/man-1.6e/man-1.6e-ro_usr.patch
+++ /dev/null
@@ -1,67 +0,0 @@
1--- man-1.6e.orig/src/makewhatis.sh 2006-07-19 01:58:08.000000000 -0300
2+++ man-1.6e/src/makewhatis.sh 2007-05-18 10:54:57.000000000 -0300
3@@ -124,7 +124,7 @@
4 continue;;
5 -s) setsections=1
6 continue;;
7- -u) findarg="-ctime 0"
8+ -u) findarg="-newer /var/cache/man/whatis"
9 update=1
10 continue;;
11 -v) verbose=1
12@@ -165,14 +165,7 @@
13 # first truncate all the whatis files that will be created new,
14 # then only update - we might visit the same directory twice
15 if [ x$update = x ]; then
16- for pages in man cat
17- do
18- eval path="\$$pages"path
19- for mandir in $path
20- do
21- cp /dev/null $mandir/whatis
22- done
23- done
24+ cp /dev/null /var/cache/man/whatis
25 fi
26
27 for pages in man cat
28@@ -184,11 +177,6 @@
29 if [ x$verbose != x ]; then
30 echo "about to enter $mandir" > /dev/stderr
31 fi
32- if [ -s ${mandir}/whatis -a $pages = man -a x$update = x ]; then
33- if [ x$verbose != x ]; then
34- echo skipping $mandir - we did it already > /dev/stderr
35- fi
36- else
37 here=`pwd`
38 cd $mandir
39 for i in $sections
40@@ -407,23 +395,14 @@
41
42 cd $here
43
44- # kludge for Slackware's /usr/man/preformat
45- if [ $mandir = /usr/man/preformat ]
46- then
47- mandir1=/usr/man
48- else
49- mandir1=$mandir
50- fi
51-
52- if [ -f ${mandir1}/whatis ]
53+ if [ -f /var/cache/man/whatis ]
54 then
55- cat ${mandir1}/whatis >> $TMPFILE
56+ cat /var/cache/man/whatis >> $TMPFILE
57 fi
58- tr -s '\n' < $TMPFILE | sort -u > ${mandir1}/whatis
59+ tr -s '\n' < $TMPFILE | sort -u > /var/cache/man/whatis
60
61- chmod 644 ${mandir1}/whatis
62+ chmod 644 /var/cache/man/whatis
63 rm $TMPFILE
64- fi
65 done
66 done
67
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
deleted file mode 100644
index 180d4a3178..0000000000
--- a/meta/recipes-extended/man/man-1.6e/man-1.6e-whatis2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1--- man-1.6e-ro_usr/src/makewhatis.sh 2007-05-18 11:41:50.000000000 -0300
2+++ man-1.6e/src/makewhatis.sh 2007-05-18 13:27:16.000000000 -0300
3@@ -162,10 +162,15 @@
4 fi
5 catpath=`echo ${catpath} | tr : ' '`
6
7+#WHATIS_DIR=$DESTDIR/var/cache/man/`echo $here|sed -e 's!.*/man/!!g'`
8+WHATIS_DIR=$DESTDIR/var/cache/man/$LANG
9+[[ -d $WHATIS_DIR ]] || mkdir -p $WHATIS_DIR/
10+
11 # first truncate all the whatis files that will be created new,
12 # then only update - we might visit the same directory twice
13 if [ x$update = x ]; then
14- cp /dev/null /var/cache/man/whatis
15+ mkdir -p $WHATIS_DIR/
16+ /bin/echo -n > $WHATIS_DIR/whatis
17 fi
18
19 for pages in man cat
20@@ -395,13 +400,13 @@
21
22 cd $here
23
24- if [ -f /var/cache/man/whatis ]
25+ if [ -f $WHATIS_DIR/whatis ]
26 then
27- cat /var/cache/man/whatis >> $TMPFILE
28+ cat $WHATIS_DIR/whatis >> $TMPFILE
29 fi
30- tr -s '\n' < $TMPFILE | sort -u > /var/cache/man/whatis
31+ tr -s '\n' < $TMPFILE | sort -u > $WHATIS_DIR/whatis
32
33- chmod 644 /var/cache/man/whatis
34+ chmod 644 $WHATIS_DIR/whatis
35 rm $TMPFILE
36 done
37 done
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5g-nonrootbuild.patch b/meta/recipes-extended/man/man-1.6f/man-1.5g-nonrootbuild.patch
index ae2bc4d17f..ae2bc4d17f 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.5g-nonrootbuild.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.5g-nonrootbuild.patch
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5h1-gencat.patch b/meta/recipes-extended/man/man-1.6f/man-1.5h1-gencat.patch
index 6409dfce55..6409dfce55 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.5h1-gencat.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.5h1-gencat.patch
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5h1-make.patch b/meta/recipes-extended/man/man-1.6f/man-1.5h1-make.patch
index f9f91e4d0e..f9f91e4d0e 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.5h1-make.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.5h1-make.patch
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5i2-initial.patch b/meta/recipes-extended/man/man-1.6f/man-1.5i2-initial.patch
index 1b1442385e..1b1442385e 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.5i2-initial.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.5i2-initial.patch
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5i2-newline.patch b/meta/recipes-extended/man/man-1.6f/man-1.5i2-newline.patch
index da95d5ad18..da95d5ad18 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.5i2-newline.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.5i2-newline.patch
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5i2-overflow.patch b/meta/recipes-extended/man/man-1.6f/man-1.5i2-overflow.patch
index f1ef06bab0..f1ef06bab0 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.5i2-overflow.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.5i2-overflow.patch
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5j-i18n.patch b/meta/recipes-extended/man/man-1.6f/man-1.5j-i18n.patch
index 7645542e16..7645542e16 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.5j-i18n.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.5j-i18n.patch
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5j-nocache.patch b/meta/recipes-extended/man/man-1.6f/man-1.5j-nocache.patch
index 267b34b93a..267b34b93a 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.5j-nocache.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.5j-nocache.patch
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5j-utf8.patch b/meta/recipes-extended/man/man-1.6f/man-1.5j-utf8.patch
index c817763676..c817763676 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.5j-utf8.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.5j-utf8.patch
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5k-confpath.patch b/meta/recipes-extended/man/man-1.6f/man-1.5k-confpath.patch
index 71ac9fcfc9..71ac9fcfc9 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.5k-confpath.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.5k-confpath.patch
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5k-nonascii.patch b/meta/recipes-extended/man/man-1.6f/man-1.5k-nonascii.patch
index 465d839ea0..465d839ea0 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.5k-nonascii.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.5k-nonascii.patch
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5k-sofix.patch b/meta/recipes-extended/man/man-1.6f/man-1.5k-sofix.patch
index d4522ea974..d4522ea974 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.5k-sofix.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.5k-sofix.patch
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5m2-bug11621.patch b/meta/recipes-extended/man/man-1.6f/man-1.5m2-bug11621.patch
index 9c06c4c104..9c06c4c104 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.5m2-bug11621.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.5m2-bug11621.patch
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5m2-buildroot.patch b/meta/recipes-extended/man/man-1.6f/man-1.5m2-buildroot.patch
index d84208390a..d84208390a 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.5m2-buildroot.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.5m2-buildroot.patch
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5m2-multiple.patch b/meta/recipes-extended/man/man-1.6f/man-1.5m2-multiple.patch
index cc5bffde63..cc5bffde63 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.5m2-multiple.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.5m2-multiple.patch
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.6f/man-1.5m2-no-color-for-printing.patch
index d1f810a442..d1f810a442 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.5m2-no-color-for-printing.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.5m2-no-color-for-printing.patch
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5m2-sigpipe.patch b/meta/recipes-extended/man/man-1.6f/man-1.5m2-sigpipe.patch
index 81fb2d702a..81fb2d702a 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.5m2-sigpipe.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.5m2-sigpipe.patch
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.5m2-tv_fhs.patch b/meta/recipes-extended/man/man-1.6f/man-1.5m2-tv_fhs.patch
index 20389d9c08..20389d9c08 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.5m2-tv_fhs.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.5m2-tv_fhs.patch
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.6e-i18n_whatis.patch b/meta/recipes-extended/man/man-1.6f/man-1.6e-i18n_whatis.patch
index ad62a6016f..ad62a6016f 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.6e-i18n_whatis.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.6e-i18n_whatis.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.6e-lzma+xz-support.patch b/meta/recipes-extended/man/man-1.6f/man-1.6e-lzma+xz-support.patch
new file mode 100644
index 0000000000..f8ade4fc58
--- /dev/null
+++ b/meta/recipes-extended/man/man-1.6f/man-1.6e-lzma+xz-support.patch
@@ -0,0 +1,120 @@
1Index: man-1.6f/configure
2===================================================================
3--- man-1.6f.orig/configure 2010-12-29 14:00:35.000000000 -0800
4+++ man-1.6f/configure 2010-12-29 14:27:57.584431711 -0800
5@@ -1027,7 +1027,7 @@
6 then
7 DO_COMPRESSION=true
8 compress=
9- for i in lzma bzip2 gzip bzip tzip pack compress freeze yabba
10+ for i in xz lzma bzip2 gzip bzip tzip pack compress freeze yabba
11 do
12 eval F$i=missing
13 for j in $DEFPATH
14@@ -1080,6 +1080,7 @@
15 fi
16
17 case $compress in
18+ *xz*) ext=".xz" ;;
19 *lzma*) ext=".lzma" ;;
20 *bzip2*) ext=".bz2" ;;
21 *gzip*) ext=".gz" ;;
22@@ -1123,7 +1124,7 @@
23 fi
24
25 # unconditionally handle uncompression
26-UNCOMPRESSORS="unlzma gunzip bzip2 pcat zcat fcat unyabba"
27+UNCOMPRESSORS="unxz unlzma gunzip bzip2 pcat zcat fcat unyabba"
28 for i in $UNCOMPRESSORS
29 do
30 eval F$i=missing
31@@ -1144,6 +1145,10 @@
32 if [ $Fbzip2 != missing ]; then
33 bzip2="$Fbzip2 -c -d"
34 fi
35+unxz=missing
36+if [ $Funxz != missing ]; then
37+ unxz="$Funxz -c -d"
38+fi
39 unlzma=missing
40 if [ $Funlzma != missing ]; then
41 unlzma="$Funlzma -c -d"
42@@ -1176,6 +1181,9 @@
43 bzip2)
44 echo "Command to use for .bz2 files (standard bzip2)"
45 echo $n "[`eval echo \\$$filter`] $c" ;;
46+ xz)
47+ echo "Command to use for .xz files (standard xz)"
48+ echo $n "[`eval echo \\$$filter`] $c" ;;
49 lzma)
50 echo "Command to use for .lzma files (standard lzma)"
51 echo $n "[`eval echo \\$$filter`] $c" ;;
52@@ -1240,6 +1248,7 @@
53 case $compress_ext in
54 .gz) decompress=$gunzip ;;
55 .bz2) decompress=$bzip2 ;;
56+ .xz) decompress=$unxz ;;
57 .lzma) decompress=$unlzma ;;
58 .z) decompress=$pcat ;;
59 .Z) decompress=$zcat ;;
60@@ -1333,6 +1342,7 @@
61 s,@zcat@,$zcat,
62 s,@gunzip@,$gunzip,
63 s,@bzip2@,$bzip2,
64+s,@unxz@,$unxz,
65 s,@unlzma@,$unlzma,
66 s,@unyabba@,$unyabba,
67 s,@compress@,$compress,
68Index: man-1.6f/src/makewhatis.sh
69===================================================================
70--- man-1.6f.orig/src/makewhatis.sh 2010-12-29 14:00:35.000000000 -0800
71+++ man-1.6f/src/makewhatis.sh 2010-12-29 14:16:18.821555314 -0800
72@@ -242,7 +242,7 @@
73 find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | LC_ALL=C $AWK -v MAN_NAME="$MAN_NAME" -v MAN_DESCRIPTION="$MAN_DESCRIPTION" '
74
75 function readline() {
76- if (use_zcat || use_bzcat || use_lzcat) {
77+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
78 result = (pipe_cmd | getline);
79 if (result < 0) {
80 print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr";
81@@ -257,7 +257,7 @@
82 }
83
84 function closeline() {
85- if (use_zcat || use_bzcat || use_lzcat) {
86+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
87 return close(pipe_cmd);
88 } else {
89 return close(filename);
90@@ -278,7 +278,9 @@
91 use_bzcat = match(filename,"\\.bz2");
92 if(!use_bzcat)
93 use_lzcat = match(filename,"\\.lzma");
94- if (use_zcat || use_bzcat || use_lzcat ) {
95+ if(!use_xzcat)
96+ use_xzcat = match(filename,"\\.xz");
97+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat ) {
98 filename_no_gz = substr(filename, 0, RSTART - 1);
99 } else {
100 filename_no_gz = filename;
101@@ -291,14 +293,16 @@
102 actual_section = section;
103 }
104 sub(/\..*/, "", progname);
105- if (use_zcat || use_bzcat || use_lzcat) {
106+ if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
107 if (use_zcat) {
108 pipe_cmd = "zcat \"" filename "\"";
109 } else if (use_bzcat) {
110 pipe_cmd = "bzcat \"" filename "\"";
111- } else {
112+ } else if (use_lzcat) {
113 pipe_cmd = "lzcat \"" filename "\"";
114- }
115+ } else {
116+ pipe_cmd = "xzcat \"" filename "\"";
117+ }
118 # try to avoid suspicious stuff
119 if (filename ~ /[;&|`$(]/) {
120 print "ignored strange file name " filename " in " curdir > "/dev/stderr";
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.6e-mandirs.patch b/meta/recipes-extended/man/man-1.6f/man-1.6e-mandirs.patch
index 06e9869754..06e9869754 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.6e-mandirs.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.6e-mandirs.patch
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.6e-new_sections.patch b/meta/recipes-extended/man/man-1.6f/man-1.6e-new_sections.patch
index 51727588f4..51727588f4 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.6e-new_sections.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.6e-new_sections.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.6e-ro_usr.patch b/meta/recipes-extended/man/man-1.6f/man-1.6e-ro_usr.patch
new file mode 100644
index 0000000000..d330e62b0b
--- /dev/null
+++ b/meta/recipes-extended/man/man-1.6f/man-1.6e-ro_usr.patch
@@ -0,0 +1,29 @@
1Index: man-1.6f/src/makewhatis.sh
2===================================================================
3--- man-1.6f.orig/src/makewhatis.sh 2010-12-29 13:42:34.000000000 -0800
4+++ man-1.6f/src/makewhatis.sh 2010-12-29 13:42:35.667428347 -0800
5@@ -124,7 +124,7 @@
6 continue;;
7 -s) setsections=1
8 continue;;
9- -u) findarg="-ctime 0"
10+ -u) findarg="-newer /var/cache/man/whatis"
11 update=1
12 continue;;
13 -v) verbose=1
14@@ -165,14 +165,7 @@
15 # first truncate all the whatis files that will be created new,
16 # then only update - we might visit the same directory twice
17 if [ x$update = x ]; then
18- for pages in man cat
19- do
20- eval path="\$$pages"path
21- for mandir in $path
22- do
23- cp /dev/null $mandir/whatis
24- done
25- done
26+ cp /dev/null /var/cache/man/whatis
27 fi
28
29 for pages in man cat
diff --git a/meta/recipes-extended/man/man-1.6e/man-1.6e-security.patch b/meta/recipes-extended/man/man-1.6f/man-1.6e-security.patch
index 85fdf4e5fc..85fdf4e5fc 100644
--- a/meta/recipes-extended/man/man-1.6e/man-1.6e-security.patch
+++ b/meta/recipes-extended/man/man-1.6f/man-1.6e-security.patch
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.6f/man-1.6e-use_i18n_vars_in_a_std_way.patch
index a448da54d7..a448da54d7 100644
--- 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.6f/man-1.6e-use_i18n_vars_in_a_std_way.patch
diff --git a/meta/recipes-extended/man/man-1.6f/man-1.6e-whatis2.patch b/meta/recipes-extended/man/man-1.6f/man-1.6e-whatis2.patch
new file mode 100644
index 0000000000..1a10be3611
--- /dev/null
+++ b/meta/recipes-extended/man/man-1.6f/man-1.6e-whatis2.patch
@@ -0,0 +1,48 @@
1Index: man-1.6f/src/makewhatis.sh
2===================================================================
3--- man-1.6f.orig/src/makewhatis.sh 2010-12-29 13:51:45.000000000 -0800
4+++ man-1.6f/src/makewhatis.sh 2010-12-29 13:59:35.399799412 -0800
5@@ -164,10 +164,15 @@
6 fi
7 catpath=`echo ${catpath} | tr : ' '`
8
9+#WHATIS_DIR=$DESTDIR/var/cache/man/`echo $here|sed -e 's!.*/man/!!g'`
10+WHATIS_DIR=$DESTDIR/var/cache/man/$LANG
11+[[ -d $WHATIS_DIR ]] || mkdir -p $WHATIS_DIR/
12+
13 # first truncate all the whatis files that will be created new,
14 # then only update - we might visit the same directory twice
15 if [ x$update = x ]; then
16- cp /dev/null /var/cache/man/whatis
17+ mkdir -p $WHATIS_DIR/
18+ /bin/echo -n > $WHATIS_DIR/whatis
19 fi
20
21 for pages in man cat
22@@ -180,13 +185,7 @@
23 echo "about to enter $mandir" > /dev/stderr
24 fi
25
26- # kludge for Slackware's /usr/man/preformat
27- if [ $mandir = /usr/man/preformat ]
28- then
29- mandir1=/usr/man
30- else
31- mandir1=$mandir
32- fi
33+ mandir1=$WHATIS_DIR
34
35 # if $mandir is on a readonly partition, and the whatis file
36 # is not a symlink, then let's skip trying to update it
37@@ -207,11 +206,6 @@
38 fi
39 fi
40
41- if [ -s ${mandir}/whatis -a $pages = man -a x$update = x ]; then
42- if [ x$verbose != x ]; then
43- echo skipping $mandir - we did it already > /dev/stderr
44- fi
45- else
46 here=`pwd`
47 cd $mandir
48 for i in $sections
diff --git a/meta/recipes-extended/man/man-1.6e/man.1.gz b/meta/recipes-extended/man/man-1.6f/man.1.gz
index c368045153..c368045153 100644
--- a/meta/recipes-extended/man/man-1.6e/man.1.gz
+++ b/meta/recipes-extended/man/man-1.6f/man.1.gz
Binary files differ
diff --git a/meta/recipes-extended/man/man-1.6e/man.7.gz b/meta/recipes-extended/man/man-1.6f/man.7.gz
index e85af82426..e85af82426 100644
--- a/meta/recipes-extended/man/man-1.6e/man.7.gz
+++ b/meta/recipes-extended/man/man-1.6f/man.7.gz
Binary files differ
diff --git a/meta/recipes-extended/man/man-1.6e/manpath.5.gz b/meta/recipes-extended/man/man-1.6f/manpath.5.gz
index c012ff8976..c012ff8976 100644
--- a/meta/recipes-extended/man/man-1.6e/manpath.5.gz
+++ b/meta/recipes-extended/man/man-1.6f/manpath.5.gz
Binary files differ
diff --git a/meta/recipes-extended/man/man_1.6e.bb b/meta/recipes-extended/man/man_1.6f.bb
index 930cca90c4..f1c9754434 100644
--- a/meta/recipes-extended/man/man_1.6e.bb
+++ b/meta/recipes-extended/man/man_1.6f.bb
@@ -10,7 +10,7 @@ DEPENDS = "groff less"
10 10
11LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" 11LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
12 12
13SRC_URI = "http://primates.ximian.com/~flucifredi/man/man-1.6e.tar.gz \ 13SRC_URI = "http://primates.ximian.com/~flucifredi/${PN}/${PN}-${PV}.tar.gz \
14 file://man-1.5k-confpath.patch;striplevel=0 \ 14 file://man-1.5k-confpath.patch;striplevel=0 \
15 file://man-1.5h1-make.patch;striplevel=1 \ 15 file://man-1.5h1-make.patch;striplevel=1 \
16 file://man-1.5k-nonascii.patch;striplevel=1 \ 16 file://man-1.5k-nonascii.patch;striplevel=1 \
@@ -38,8 +38,8 @@ SRC_URI = "http://primates.ximian.com/~flucifredi/man/man-1.6e.tar.gz \
38 file://man-1.6e-lzma+xz-support.patch;striplevel=1 \ 38 file://man-1.6e-lzma+xz-support.patch;striplevel=1 \
39 file://man*" 39 file://man*"
40 40
41SRC_URI[md5sum] = "d8187cd756398baefc48ba7d60ff6a8a" 41SRC_URI[md5sum] = "67aaaa6df35215e812fd7d89472c44b6"
42SRC_URI[sha256sum] = "022faf23844eabb3662eabb105836925dd83bedda10271e2450a5bc5b61a5b5f" 42SRC_URI[sha256sum] = "9f208c7e1981371ad4481d6e6c2c566bc726a15778723f94136d220fb9375f6c"
43 43
44 44
45do_configure () { 45do_configure () {