* [PATCH 01/10] cryptodev: switch SRC_URI to git
@ 2018-02-12 11:05 Alexander Kanavin
2018-02-12 11:05 ` [PATCH 02/10] devtool: fix upstream version check for devtool-test-local recipe Alexander Kanavin
` (8 more replies)
0 siblings, 9 replies; 16+ messages in thread
From: Alexander Kanavin @ 2018-02-12 11:05 UTC (permalink / raw)
To: openembedded-core
One of the tarball mirrors is down; the other is blocked by Intel's corporate proxy
for being deemed 'suspicious' (the same problem might pop up in other
companies as well). Let's just take the source from github.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-kernel/cryptodev/cryptodev.inc | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-kernel/cryptodev/cryptodev.inc b/meta/recipes-kernel/cryptodev/cryptodev.inc
index 50366e72024..ab15bc1d971 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev.inc
+++ b/meta/recipes-kernel/cryptodev/cryptodev.inc
@@ -3,11 +3,9 @@ HOMEPAGE = "http://cryptodev-linux.org/"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRC_URI = "http://nwl.cc/pub/cryptodev-linux/cryptodev-linux-${PV}.tar.gz"
+SRC_URI = "git://github.com/cryptodev-linux/cryptodev-linux"
+SRCREV = "87d959d9a279c055b361de8e730fab6a7144edd7"
-SRC_URI[md5sum] = "cb4e0ed9e5937716c7c8a7be84895b6d"
-SRC_URI[sha256sum] = "9f4c0b49b30e267d776f79455d09c70cc9c12c86eee400a0d0a0cd1d8e467950"
-
-S = "${WORKDIR}/cryptodev-linux-${PV}"
+S = "${WORKDIR}/git"
CLEANBROKEN = "1"
--
2.15.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 02/10] devtool: fix upstream version check for devtool-test-local recipe
2018-02-12 11:05 [PATCH 01/10] cryptodev: switch SRC_URI to git Alexander Kanavin
@ 2018-02-12 11:05 ` Alexander Kanavin
2018-02-12 11:05 ` [PATCH 03/10] lsbinitscripts: update to 9.79 Alexander Kanavin
` (7 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Alexander Kanavin @ 2018-02-12 11:05 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb b/meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb
index 6bfc557060a..b377cb76051 100644
--- a/meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb
+++ b/meta-selftest/recipes-test/devtool/devtool-test-local_6.03.bb
@@ -9,6 +9,7 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/syslinux-${PV}.tar.x
SRC_URI[md5sum] = "92a253df9211e9c20172796ecf388f13"
SRC_URI[sha256sum] = "26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e"
+UPSTREAM_VERSION_UNKNOWN = "1"
S = "${WORKDIR}/syslinux-${PV}"
--
2.15.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 03/10] lsbinitscripts: update to 9.79
2018-02-12 11:05 [PATCH 01/10] cryptodev: switch SRC_URI to git Alexander Kanavin
2018-02-12 11:05 ` [PATCH 02/10] devtool: fix upstream version check for devtool-test-local recipe Alexander Kanavin
@ 2018-02-12 11:05 ` Alexander Kanavin
2018-02-12 11:05 ` [PATCH 04/10] pax: remove the recipe Alexander Kanavin
` (6 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Alexander Kanavin @ 2018-02-12 11:05 UTC (permalink / raw)
To: openembedded-core
Switch to github as pkgs.fedoraproject.org is down.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
.../lsb/lsbinitscripts/functions.patch | 21 +++++++++++----------
...sbinitscripts_9.72.bb => lsbinitscripts_9.79.bb} | 8 +++++---
2 files changed, 16 insertions(+), 13 deletions(-)
rename meta/recipes-extended/lsb/{lsbinitscripts_9.72.bb => lsbinitscripts_9.79.bb} (73%)
diff --git a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
index 9c58d90c382..e912daa701a 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
+++ b/meta/recipes-extended/lsb/lsbinitscripts/functions.patch
@@ -1,7 +1,7 @@
-From 57468c5f4e364bdad556604dca09046e1afca929 Mon Sep 17 00:00:00 2001
+From e46b056282c8420f096d5c34d78c00f816788784 Mon Sep 17 00:00:00 2001
From: Fan Xin <fan.xin@jp.fujitsu.com>
Date: Mon, 5 Jun 2017 16:26:47 +0900
-Subject: [PATCH] Upstream-Status: Inappropriate [configuration]
+Subject: [PATCH 1/2] Upstream-Status: Inappropriate [configuration]
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
@@ -10,23 +10,24 @@ Rebase on 9.72
Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
Upstream-Status: Pending
+
---
- initscripts-9.72/rc.d/init.d/functions | 2 +-
+ rc.d/init.d/functions | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/initscripts-9.72/rc.d/init.d/functions b/initscripts-9.72/rc.d/init.d/functions
-index 0f627f1..a6aa092 100644
---- a/initscripts-9.72/rc.d/init.d/functions
-+++ b/initscripts-9.72/rc.d/init.d/functions
+diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
+index 2e3da964..1a204dec 100644
+--- a/rc.d/init.d/functions
++++ b/rc.d/init.d/functions
@@ -59,7 +59,7 @@ systemctl_redirect () {
[ -z "${COLUMNS:-}" ] && COLUMNS=80
if [ -z "${CONSOLETYPE:-}" ]; then
-- if [ -c "/dev/stderr" -a -r "/dev/stderr" ]; then
-+ if [ -c "/dev/stderr" -a -r "/dev/stderr" -a -e /sbin/consoletype ]; then
+- if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ]; then
++ if [ -c "/dev/stderr" ] && [ -r "/dev/stderr" ] && [ -e /sbin/consoletype ]; then
CONSOLETYPE="$(/sbin/consoletype < /dev/stderr 2>/dev/null)"
else
CONSOLETYPE="serial"
--
-1.9.1
+2.15.1
diff --git a/meta/recipes-extended/lsb/lsbinitscripts_9.72.bb b/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb
similarity index 73%
rename from meta/recipes-extended/lsb/lsbinitscripts_9.72.bb
rename to meta/recipes-extended/lsb/lsbinitscripts_9.79.bb
index 2d74a6f9d3b..46edeed8a48 100644
--- a/meta/recipes-extended/lsb/lsbinitscripts_9.72.bb
+++ b/meta/recipes-extended/lsb/lsbinitscripts_9.79.bb
@@ -10,11 +10,13 @@ RCONFLICTS_${PN} = "initscripts-functions"
LIC_FILES_CHKSUM = "file://COPYING;md5=ebf4e8b49780ab187d51bd26aaa022c6"
-S="${WORKDIR}/initscripts-${PV}"
-SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/initscripts/initscripts-${PV}.tar.gz/sha512/b6ed38f9576e9227c2ecf047e2d60e1e872f40d51d13861b0c91dddb282f10f7e6b79706a4d1435d7a57a14a0b73a1b71541cfe44c00e8e03ef96b08de19ec32/initscripts-${PV}.tar.gz \
- file://functions.patch;striplevel=2 \
+S = "${WORKDIR}/git"
+SRC_URI = "git://github.com/fedora-sysv/initscripts \
+ file://functions.patch \
file://0001-functions-avoid-exit-1-which-causes-init-scripts-to-.patch \
"
+SRCREV = "a51c1b4f7dcf55b568b2ee4c2b18078849943469"
+UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)"
SRC_URI[md5sum] = "d6c798f40dceb117e12126d94cb25a9a"
SRC_URI[sha256sum] = "1793677bdd1f7ee4cb00878ce43346196374f848a4c8e4559e086040fc7487db"
--
2.15.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 04/10] pax: remove the recipe
2018-02-12 11:05 [PATCH 01/10] cryptodev: switch SRC_URI to git Alexander Kanavin
2018-02-12 11:05 ` [PATCH 02/10] devtool: fix upstream version check for devtool-test-local recipe Alexander Kanavin
2018-02-12 11:05 ` [PATCH 03/10] lsbinitscripts: update to 9.79 Alexander Kanavin
@ 2018-02-12 11:05 ` Alexander Kanavin
2018-02-12 11:05 ` [PATCH 05/10] image-live.bbclass: drop support for compressed ISO images Alexander Kanavin
` (5 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Alexander Kanavin @ 2018-02-12 11:05 UTC (permalink / raw)
To: openembedded-core
The situation with pax (vs. tar and cpio) is perfectly described here:
https://xkcd.com/927/
The only reason pax is still around, kind of, is because both POSIX and LSB
mandate it. Outside of those documents, it's not used by anyone.
Meanwhile, the upstream URI we've been taking it from went down, and rather
than seek an alternative source, I just went ahead and removed the recipe.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
README.LSB | 1 +
meta/conf/distro/include/maintainers.inc | 1 -
.../packagegroup-core-full-cmdline.bb | 1 -
.../packagegroups/packagegroup-core-lsb.bb | 1 -
.../pax/0001-Add-a-comment-for-fallthrough.patch | 38 -
.../pax/pax/0001-Fix-build-with-musl.patch | 1287 --------------------
...s-sysmacros.h-for-major-minor-definitions.patch | 65 -
.../pax/0001-use-strtoll-instead-of-strtoq.patch | 33 -
.../pax/pax/fix_for_compile_with_gcc-4.6.0.patch | 25 -
.../pax/pax/pax-3.4_fix_for_x32.patch | 185 ---
meta/recipes-extended/pax/pax_3.4.bb | 31 -
11 files changed, 1 insertion(+), 1667 deletions(-)
delete mode 100644 meta/recipes-extended/pax/pax/0001-Add-a-comment-for-fallthrough.patch
delete mode 100644 meta/recipes-extended/pax/pax/0001-Fix-build-with-musl.patch
delete mode 100644 meta/recipes-extended/pax/pax/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch
delete mode 100644 meta/recipes-extended/pax/pax/0001-use-strtoll-instead-of-strtoq.patch
delete mode 100644 meta/recipes-extended/pax/pax/fix_for_compile_with_gcc-4.6.0.patch
delete mode 100644 meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch
delete mode 100644 meta/recipes-extended/pax/pax_3.4.bb
diff --git a/README.LSB b/README.LSB
index c9dca3fc75e..f68d07c9e03 100644
--- a/README.LSB
+++ b/README.LSB
@@ -23,3 +23,4 @@ therefore provides compatibility with the following caveats:
* libpng 1.2 isn't provided; oe-core includes the latest release of libpng
instead.
+* pax (POSIX standard archive) tool is not provided.
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 9b25a112b75..16a15a3865e 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -562,7 +562,6 @@ RECIPE_MAINTAINER_pn-pango = "Maxin B. John <maxin.john@intel.com>"
RECIPE_MAINTAINER_pn-parted = "Hongxu Jia <hongxu.jia@windriver.com>"
RECIPE_MAINTAINER_pn-patch = "Hongxu Jia <hongxu.jia@windriver.com>"
RECIPE_MAINTAINER_pn-patchelf = "Richard Purdie <richard.purdie@linuxfoundation.org>"
-RECIPE_MAINTAINER_pn-pax = "Hongxu Jia <hongxu.jia@windriver.com>"
RECIPE_MAINTAINER_pn-pax-utils = "Hongxu Jia <hongxu.jia@windriver.com>"
RECIPE_MAINTAINER_pn-pbzip2 = "Denys Dmytriyenko <denys@ti.com>"
RECIPE_MAINTAINER_pn-pciutils = "Chen Qi <Qi.Chen@windriver.com>"
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
index fdede5954c3..318959e6649 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
@@ -89,7 +89,6 @@ RDEPENDS_packagegroup-core-full-cmdline-utils = "\
mktemp \
ncurses \
net-tools \
- pax \
popt \
procps \
psmisc \
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index 8ba02e62834..8959e3c8f46 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -158,7 +158,6 @@ RDEPENDS_packagegroup-core-lsb-core = "\
mktemp \
msmtp \
patch \
- pax \
procps \
psmisc \
sed \
diff --git a/meta/recipes-extended/pax/pax/0001-Add-a-comment-for-fallthrough.patch b/meta/recipes-extended/pax/pax/0001-Add-a-comment-for-fallthrough.patch
deleted file mode 100644
index b76f85aa458..00000000000
--- a/meta/recipes-extended/pax/pax/0001-Add-a-comment-for-fallthrough.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From e67bb3debe582f0e77770b714bd012bb1082fc41 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 19 Apr 2017 11:32:00 -0700
-Subject: [PATCH] Add a comment for fallthrough
-
-Fixes warnings with gcc7 e.g.
-
-../../../../../../../workspace/sources/pax/src/options.c: In function 'tar_options':
-../../../../../../../workspace/sources/pax/src/options.c:725:7: error: this statement may fall through [-Werror=implicit-fallthrough=]
- if (opt_add ("write_opt=nodir") < 0)
- ^
-../../../../../../../workspace/sources/pax/src/options.c:730:2: note: here
- case 'O':
- ^~~~
-cc1: all warnings being treated as errors
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/options.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/options.c b/src/options.c
-index c663b4e..b80819a 100644
---- a/src/options.c
-+++ b/src/options.c
-@@ -724,6 +724,7 @@ tar_options (int argc, char **argv)
- case 'o':
- if (opt_add ("write_opt=nodir") < 0)
- tar_usage ();
-+ /* fallthru */
- case 'O':
- Oflag = 1;
- break;
---
-2.12.2
-
diff --git a/meta/recipes-extended/pax/pax/0001-Fix-build-with-musl.patch b/meta/recipes-extended/pax/pax/0001-Fix-build-with-musl.patch
deleted file mode 100644
index 61bf2de5ea5..00000000000
--- a/meta/recipes-extended/pax/pax/0001-Fix-build-with-musl.patch
+++ /dev/null
@@ -1,1287 +0,0 @@
-From 47c4db8d37248d968fac7ee4a71ca64398890723 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 6 Jan 2016 11:57:21 -0800
-Subject: [PATCH] Fix build with musl
-
-Remove BSDisms
-Remove fts, and link to libfts thats provided externally
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Inappropriate[musl specific]
-
- lib/Makefile.am | 4 +-
- lib/fts.c | 1025 -------------------------------------------------------
- lib/fts.h | 131 -------
- lib/vis.h | 13 +-
- src/Makefile.am | 2 +-
- src/extern.h | 2 -
- src/file_subs.c | 2 +-
- src/tables.c | 2 +-
- 8 files changed, 14 insertions(+), 1167 deletions(-)
- delete mode 100644 lib/fts.c
- delete mode 100644 lib/fts.h
-
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 56d0859..7f5045a 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -8,8 +8,8 @@ AUTOMAKE_OPTIONS = 1.7 gnits
- CLEANFILES = *~
-
- noinst_LIBRARIES = libbsdfunc.a
--noinst_HEADERS = vis.h bsdfunc.h fts.h
-+noinst_HEADERS = vis.h bsdfunc.h
-
- AM_CFLAGS = @EXTRA_CFLAGS@
-
--libbsdfunc_a_SOURCES = vis.c strlcpy.c strmode.c fts.c
-+libbsdfunc_a_SOURCES = vis.c strlcpy.c strmode.c
-diff --git a/lib/fts.c b/lib/fts.c
-deleted file mode 100644
-index 45e90ca..0000000
---- a/lib/fts.c
-+++ /dev/null
-@@ -1,1025 +0,0 @@
--/*-
-- * Copyright (c) 1990, 1993, 1994
-- * The Regents of the University of California. All rights reserved.
-- *
-- * Redistribution and use in source and binary forms, with or without
-- * modification, are permitted provided that the following conditions
-- * are met:
-- * 1. Redistributions of source code must retain the above copyright
-- * notice, this list of conditions and the following disclaimer.
-- * 2. Redistributions in binary form must reproduce the above copyright
-- * notice, this list of conditions and the following disclaimer in the
-- * documentation and/or other materials provided with the distribution.
-- * 4. Neither the name of the University nor the names of its contributors
-- * may be used to endorse or promote products derived from this software
-- * without specific prior written permission.
-- *
-- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-- * SUCH DAMAGE.
-- */
--
--#ifdef HAVE_CONFIG_H
--#include <config.h>
--#endif
--
--#include <sys/stat.h>
--#include <fcntl.h>
--#include <dirent.h>
--#include <errno.h>
--#include <fts.h>
--#include <stdlib.h>
--#include <string.h>
--#include <unistd.h>
--
--/* Largest alignment size needed, minus one.
-- Usually long double is the worst case. */
--#ifndef ALIGNBYTES
--#define ALIGNBYTES (__alignof__ (long double) - 1)
--#endif
--/* Align P to that size. */
--#ifndef ALIGN
--#define ALIGN(p) (((unsigned long int) (p) + ALIGNBYTES) & ~ALIGNBYTES)
--#endif
--
--
--static FTSENT *fts_alloc (FTS *, const char *, int);
--static FTSENT *fts_build (FTS *, int);
--static void fts_lfree (FTSENT *);
--static void fts_load (FTS *, FTSENT *);
--static size_t fts_maxarglen (char * const *);
--static void fts_padjust (FTS *, FTSENT *);
--static int fts_palloc (FTS *, size_t);
--static FTSENT *fts_sort (FTS *, FTSENT *, int);
--static u_short fts_stat (FTS *, FTSENT *, int);
--static int fts_safe_changedir (FTS *, FTSENT *, int, const char *);
--
--#ifndef MAX
--#define MAX(a, b) (a > b ? a : b)
--#endif
--
--#define ISDOT(a) (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
--
--#define CLR(opt) (sp->fts_options &= ~(opt))
--#define ISSET(opt) (sp->fts_options & (opt))
--#define SET(opt) (sp->fts_options |= (opt))
--
--#define FCHDIR(sp, fd) (!ISSET(FTS_NOCHDIR) && fchdir(fd))
--
--#define BREAD 3 /* fts_read */
--
--FTS *
--fts_open(argv, koptions, compar)
-- char * const *argv;
-- register int koptions;
-- int (*compar) (const FTSENT **, const FTSENT **);
--{
-- register FTS *sp;
-- register FTSENT *p, *root;
-- register int nitems;
-- FTSENT *parent, *tmp;
-- int len;
--
--tmp = NULL; /* stop compiler whinging */
-- /* Options check. */
-- if (koptions & ~FTS_OPTIONMASK) {
-- errno = EINVAL;
-- return (NULL);
-- }
--
-- /* Allocate/initialize the stream */
-- if ((sp = malloc((u_int)sizeof(FTS))) == NULL)
-- return (NULL);
-- memset(sp, 0, sizeof(FTS));
-- sp->fts_compar = (int (*) (const void *, const void *)) compar;
-- sp->fts_options = koptions;
--
-- /* Logical walks turn on NOCHDIR; symbolic links are too hard. */
-- if (ISSET(FTS_LOGICAL))
-- SET(FTS_NOCHDIR);
--
-- /*
-- * Start out with 1K of path space, and enough, in any case,
-- * to hold the user's paths.
-- */
--#ifndef MAXPATHLEN
--#define MAXPATHLEN 1024
--#endif
-- if (fts_palloc(sp, MAX(fts_maxarglen(argv), MAXPATHLEN)))
-- goto mem1;
--
-- /* Allocate/initialize root's parent. */
-- if ((parent = fts_alloc(sp, "", 0)) == NULL)
-- goto mem2;
-- parent->fts_level = FTS_ROOTPARENTLEVEL;
--
-- /* Allocate/initialize root(s). */
-- for (root = NULL, nitems = 0; *argv != NULL; ++argv, ++nitems) {
-- /* Don't allow zero-length paths. */
-- if ((len = strlen(*argv)) == 0) {
-- errno = ENOENT;
-- goto mem3;
-- }
--
-- p = fts_alloc(sp, *argv, len);
-- p->fts_level = FTS_ROOTLEVEL;
-- p->fts_parent = parent;
-- p->fts_accpath = p->fts_name;
-- p->fts_info = fts_stat(sp, p, ISSET(FTS_COMFOLLOW));
--
-- /* Command-line "." and ".." are real directories. */
-- if (p->fts_info == FTS_DOT)
-- p->fts_info = FTS_D;
--
-- /*
-- * If comparison routine supplied, traverse in sorted
-- * order; otherwise traverse in the order specified.
-- */
-- if (compar) {
-- p->fts_link = root;
-- root = p;
-- } else {
-- p->fts_link = NULL;
-- if (root == NULL)
-- tmp = root = p;
-- else {
-- tmp->fts_link = p;
-- tmp = p;
-- }
-- }
-- }
-- if (compar && nitems > 1)
-- root = fts_sort(sp, root, nitems);
--
-- /*
-- * Allocate a dummy pointer and make fts_read think that we've just
-- * finished the node before the root(s); set p->fts_info to FTS_INIT
-- * so that everything about the "current" node is ignored.
-- */
-- if ((sp->fts_cur = fts_alloc(sp, "", 0)) == NULL)
-- goto mem3;
-- sp->fts_cur->fts_link = root;
-- sp->fts_cur->fts_info = FTS_INIT;
--
-- /*
-- * If using chdir(2), grab a file descriptor pointing to dot to ensure
-- * that we can get back here; this could be avoided for some paths,
-- * but almost certainly not worth the effort. Slashes, symbolic links,
-- * and ".." are all fairly nasty problems. Note, if we can't get the
-- * descriptor we run anyway, just more slowly.
-- */
-- if (!ISSET(FTS_NOCHDIR)
-- && (sp->fts_rfd = open(".", O_RDONLY, 0)) < 0)
-- SET(FTS_NOCHDIR);
--
-- return (sp);
--
--mem3: fts_lfree(root);
-- free(parent);
--mem2: free(sp->fts_path);
--mem1: free(sp);
-- return (NULL);
--}
--
--static void
--fts_load(sp, p)
-- FTS *sp;
-- register FTSENT *p;
--{
-- register int len;
-- register char *cp;
--
-- /*
-- * Load the stream structure for the next traversal. Since we don't
-- * actually enter the directory until after the preorder visit, set
-- * the fts_accpath field specially so the chdir gets done to the right
-- * place and the user can access the first node. From fts_open it's
-- * known that the path will fit.
-- */
-- len = p->fts_pathlen = p->fts_namelen;
-- memmove(sp->fts_path, p->fts_name, len + 1);
-- if ((cp = strrchr(p->fts_name, '/')) && (cp != p->fts_name || cp[1])) {
-- len = strlen(++cp);
-- memmove(p->fts_name, cp, len + 1);
-- p->fts_namelen = len;
-- }
-- p->fts_accpath = p->fts_path = sp->fts_path;
-- sp->fts_dev = p->fts_dev;
--}
--
--int
--fts_close(sp)
-- FTS *sp;
--{
-- register FTSENT *freep, *p;
-- int saved_errno;
--
-- /*
-- * This still works if we haven't read anything -- the dummy structure
-- * points to the root list, so we step through to the end of the root
-- * list which has a valid parent pointer.
-- */
-- if (sp->fts_cur) {
-- for (p = sp->fts_cur; p->fts_level >= FTS_ROOTLEVEL;) {
-- freep = p;
-- p = p->fts_link != NULL ? p->fts_link : p->fts_parent;
-- free(freep);
-- }
-- free(p);
-- }
--
-- /* Free up child linked list, sort array, path buffer. */
-- if (sp->fts_child)
-- fts_lfree(sp->fts_child);
-- if (sp->fts_array)
-- free(sp->fts_array);
-- free(sp->fts_path);
--
-- /* Return to original directory, save errno if necessary. */
-- if (!ISSET(FTS_NOCHDIR)) {
-- saved_errno = fchdir(sp->fts_rfd) ? errno : 0;
-- (void)close(sp->fts_rfd);
--
-- /* Set errno and return. */
-- if (saved_errno != 0) {
-- /* Free up the stream pointer. */
-- free(sp);
-- errno = saved_errno;
-- return (-1);
-- }
-- }
--
-- /* Free up the stream pointer. */
-- free(sp);
-- return (0);
--}
--
--/*
-- * Special case of "/" at the end of the path so that slashes aren't
-- * appended which would cause paths to be written as "....//foo".
-- */
--#define NAPPEND(p) \
-- (p->fts_path[p->fts_pathlen - 1] == '/' \
-- ? p->fts_pathlen - 1 : p->fts_pathlen)
--
--FTSENT *
--fts_read(sp)
-- register FTS *sp;
--{
-- register FTSENT *p, *tmp;
-- register int instr;
-- register char *t;
-- int saved_errno;
--
-- /* If finished or unrecoverable error, return NULL. */
-- if (sp->fts_cur == NULL || ISSET(FTS_STOP))
-- return (NULL);
--
-- /* Set current node pointer. */
-- p = sp->fts_cur;
--
-- /* Save and zero out user instructions. */
-- instr = p->fts_instr;
-- p->fts_instr = FTS_NOINSTR;
--
-- /* Any type of file may be re-visited; re-stat and re-turn. */
-- if (instr == FTS_AGAIN) {
-- p->fts_info = fts_stat(sp, p, 0);
-- return (p);
-- }
--
-- /*
-- * Following a symlink -- SLNONE test allows application to see
-- * SLNONE and recover. If indirecting through a symlink, have
-- * keep a pointer to current location. If unable to get that
-- * pointer, follow fails.
-- */
-- if (instr == FTS_FOLLOW &&
-- (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) {
-- p->fts_info = fts_stat(sp, p, 1);
-- if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
-- if ((p->fts_symfd = open(".", O_RDONLY, 0)) < 0) {
-- p->fts_errno = errno;
-- p->fts_info = FTS_ERR;
-- } else
-- p->fts_flags |= FTS_SYMFOLLOW;
-- }
-- return (p);
-- }
--
-- /* Directory in pre-order. */
-- if (p->fts_info == FTS_D) {
-- /* If skipped or crossed mount point, do post-order visit. */
-- if (instr == FTS_SKIP ||
-- (ISSET(FTS_XDEV) && p->fts_dev != sp->fts_dev)) {
-- if (p->fts_flags & FTS_SYMFOLLOW)
-- (void)close(p->fts_symfd);
-- if (sp->fts_child) {
-- fts_lfree(sp->fts_child);
-- sp->fts_child = NULL;
-- }
-- p->fts_info = FTS_DP;
-- return (p);
-- }
--
-- /* Rebuild if only read the names and now traversing. */
-- if (sp->fts_child != NULL && ISSET(FTS_NAMEONLY)) {
-- CLR(FTS_NAMEONLY);
-- fts_lfree(sp->fts_child);
-- sp->fts_child = NULL;
-- }
--
-- /*
-- * Cd to the subdirectory.
-- *
-- * If have already read and now fail to chdir, whack the list
-- * to make the names come out right, and set the parent errno
-- * so the application will eventually get an error condition.
-- * Set the FTS_DONTCHDIR flag so that when we logically change
-- * directories back to the parent we don't do a chdir.
-- *
-- * If haven't read do so. If the read fails, fts_build sets
-- * FTS_STOP or the fts_info field of the node.
-- */
-- if (sp->fts_child != NULL) {
-- if (fts_safe_changedir(sp, p, -1, p->fts_accpath)) {
-- p->fts_errno = errno;
-- p->fts_flags |= FTS_DONTCHDIR;
-- for (p = sp->fts_child; p != NULL;
-- p = p->fts_link)
-- p->fts_accpath =
-- p->fts_parent->fts_accpath;
-- }
-- } else if ((sp->fts_child = fts_build(sp, BREAD)) == NULL) {
-- if (ISSET(FTS_STOP))
-- return (NULL);
-- return (p);
-- }
-- p = sp->fts_child;
-- sp->fts_child = NULL;
-- goto name;
-- }
--
-- /* Move to the next node on this level. */
--next: tmp = p;
-- if ((p = p->fts_link) != NULL) {
-- free(tmp);
--
-- /*
-- * If reached the top, return to the original directory (or
-- * the root of the tree), and load the paths for the next root.
-- */
-- if (p->fts_level == FTS_ROOTLEVEL) {
-- if (FCHDIR(sp, sp->fts_rfd)) {
-- SET(FTS_STOP);
-- return (NULL);
-- }
-- fts_load(sp, p);
-- return (sp->fts_cur = p);
-- }
--
-- /*
-- * User may have called fts_set on the node. If skipped,
-- * ignore. If followed, get a file descriptor so we can
-- * get back if necessary.
-- */
-- if (p->fts_instr == FTS_SKIP)
-- goto next;
-- if (p->fts_instr == FTS_FOLLOW) {
-- p->fts_info = fts_stat(sp, p, 1);
-- if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) {
-- if ((p->fts_symfd =
-- open(".", O_RDONLY, 0)) < 0) {
-- p->fts_errno = errno;
-- p->fts_info = FTS_ERR;
-- } else
-- p->fts_flags |= FTS_SYMFOLLOW;
-- }
-- p->fts_instr = FTS_NOINSTR;
-- }
--
--name: t = sp->fts_path + NAPPEND(p->fts_parent);
-- *t++ = '/';
-- memmove(t, p->fts_name, p->fts_namelen + 1);
-- return (sp->fts_cur = p);
-- }
--
-- /* Move up to the parent node. */
-- p = tmp->fts_parent;
-- free(tmp);
--
-- if (p->fts_level == FTS_ROOTPARENTLEVEL) {
-- /*
-- * Done; free everything up and set errno to 0 so the user
-- * can distinguish between error and EOF.
-- */
-- free(p);
-- errno = 0;
-- return (sp->fts_cur = NULL);
-- }
--
-- /* NUL terminate the pathname. */
-- sp->fts_path[p->fts_pathlen] = '\0';
--
-- /*
-- * Return to the parent directory. If at a root node or came through
-- * a symlink, go back through the file descriptor. Otherwise, cd up
-- * one directory.
-- */
-- if (p->fts_level == FTS_ROOTLEVEL) {
-- if (FCHDIR(sp, sp->fts_rfd)) {
-- SET(FTS_STOP);
-- return (NULL);
-- }
-- } else if (p->fts_flags & FTS_SYMFOLLOW) {
-- if (FCHDIR(sp, p->fts_symfd)) {
-- saved_errno = errno;
-- (void)close(p->fts_symfd);
-- errno = saved_errno;
-- SET(FTS_STOP);
-- return (NULL);
-- }
-- (void)close(p->fts_symfd);
-- } else if (!(p->fts_flags & FTS_DONTCHDIR) &&
-- fts_safe_changedir(sp, p->fts_parent, -1, "..")) {
-- SET(FTS_STOP);
-- return (NULL);
-- }
-- p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP;
-- return (sp->fts_cur = p);
--}
--
--/*
-- * Fts_set takes the stream as an argument although it's not used in this
-- * implementation; it would be necessary if anyone wanted to add global
-- * semantics to fts using fts_set. An error return is allowed for similar
-- * reasons.
-- */
--/* ARGSUSED */
--int
--fts_set(sp, p, instr)
-- FTS __attribute__((__unused__)) *sp;
-- FTSENT *p;
-- int instr;
--{
--sp = NULL; /* stop compiler whinging */
-- if (instr != 0 && instr != FTS_AGAIN && instr != FTS_FOLLOW &&
-- instr != FTS_NOINSTR && instr != FTS_SKIP) {
-- errno = EINVAL;
-- return (1);
-- }
-- p->fts_instr = instr;
-- return (0);
--}
--
--/*
-- * This is the tricky part -- do not casually change *anything* in here. The
-- * idea is to build the linked list of entries that are used by fts_children
-- * and fts_read. There are lots of special cases.
-- *
-- * The real slowdown in walking the tree is the stat calls. If FTS_NOSTAT is
-- * set and it's a physical walk (so that symbolic links can't be directories),
-- * we can do things quickly. First, if it's a 4.4BSD file system, the type
-- * of the file is in the directory entry. Otherwise, we assume that the number
-- * of subdirectories in a node is equal to the number of links to the parent.
-- * The former skips all stat calls. The latter skips stat calls in any leaf
-- * directories and for any files after the subdirectories in the directory have
-- * been found, cutting the stat calls by about 2/3.
-- */
--static FTSENT *
--fts_build(sp, type)
-- register FTS *sp;
-- int type;
--{
-- register struct dirent *dp;
-- register FTSENT *p, *head;
-- register int nitems;
-- FTSENT *cur, *tail;
-- DIR *dirp;
-- void *oldaddr;
-- int cderrno, descend, len, level, nlinks, saved_errno,
-- nostat, doadjust;
-- size_t maxlen;
-- char *cp;
--
-- /* Set current node pointer. */
-- cur = sp->fts_cur;
--
-- /*
-- * Open the directory for reading. If this fails, we're done.
-- * If being called from fts_read, set the fts_info field.
-- */
-- if ((dirp = opendir(cur->fts_accpath)) == NULL) {
-- if (type == BREAD) {
-- cur->fts_info = FTS_DNR;
-- cur->fts_errno = errno;
-- }
-- return (NULL);
-- }
--
-- /*
-- * Nlinks is the number of possible entries of type directory in the
-- * directory if we're cheating on stat calls, 0 if we're not doing
-- * any stat calls at all, -1 if we're doing stats on everything.
-- */
-- nlinks = -1;
-- nostat = 0;
--
-- /*
-- * If we're going to need to stat anything or we want to descend
-- * and stay in the directory, chdir. If this fails we keep going,
-- * but set a flag so we don't chdir after the post-order visit.
-- * We won't be able to stat anything, but we can still return the
-- * names themselves. Note, that since fts_read won't be able to
-- * chdir into the directory, it will have to return different path
-- * names than before, i.e. "a/b" instead of "b". Since the node
-- * has already been visited in pre-order, have to wait until the
-- * post-order visit to return the error. There is a special case
-- * here, if there was nothing to stat then it's not an error to
-- * not be able to stat. This is all fairly nasty. If a program
-- * needed sorted entries or stat information, they had better be
-- * checking FTS_NS on the returned nodes.
-- */
-- cderrno = 0;
-- if (nlinks || type == BREAD) {
-- if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) {
-- if (nlinks && type == BREAD)
-- cur->fts_errno = errno;
-- cur->fts_flags |= FTS_DONTCHDIR;
-- descend = 0;
-- cderrno = errno;
-- (void)closedir(dirp);
-- dirp = NULL;
-- } else
-- descend = 1;
-- } else
-- descend = 0;
--
-- /*
-- * Figure out the max file name length that can be stored in the
-- * current path -- the inner loop allocates more path as necessary.
-- * We really wouldn't have to do the maxlen calculations here, we
-- * could do them in fts_read before returning the path, but it's a
-- * lot easier here since the length is part of the dirent structure.
-- *
-- * If not changing directories set a pointer so that can just append
-- * each new name into the path.
-- */
-- len = NAPPEND(cur);
-- if (ISSET(FTS_NOCHDIR)) {
-- cp = sp->fts_path + len;
-- *cp++ = '/';
-- } else {
-- /* GCC, you're too verbose. */
-- cp = NULL;
-- }
-- len++;
-- maxlen = sp->fts_pathlen - len;
--
-- level = cur->fts_level + 1;
--
-- /* Read the directory, attaching each entry to the `link' pointer. */
-- doadjust = 0;
-- for (head = tail = NULL, nitems = 0; dirp && (dp = readdir(dirp));) {
-- if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
-- continue;
--
-- if ((p = fts_alloc(sp, dp->d_name, (int)_D_EXACT_NAMLEN (dp))) == NULL)
-- goto mem1;
-- if (_D_EXACT_NAMLEN (dp) >= maxlen) {/* include space for NUL */
-- oldaddr = sp->fts_path;
-- if (fts_palloc(sp, _D_EXACT_NAMLEN (dp) + len + 1)) {
-- /*
-- * No more memory for path or structures. Save
-- * errno, free up the current structure and the
-- * structures already allocated.
-- */
--mem1: saved_errno = errno;
-- if (p)
-- free(p);
-- fts_lfree(head);
-- (void)closedir(dirp);
-- cur->fts_info = FTS_ERR;
-- SET(FTS_STOP);
-- errno = saved_errno;
-- return (NULL);
-- }
-- /* Did realloc() change the pointer? */
-- if (oldaddr != sp->fts_path) {
-- doadjust = 1;
-- if (ISSET(FTS_NOCHDIR))
-- cp = sp->fts_path + len;
-- }
-- maxlen = sp->fts_pathlen - len;
-- }
--
-- if (len + _D_EXACT_NAMLEN (dp) >= 0x10000) {
-- /*
-- * In an FTSENT, fts_pathlen is a u_short so it is
-- * possible to wraparound here. If we do, free up
-- * the current structure and the structures already
-- * allocated, then error out with ENAMETOOLONG.
-- */
-- free(p);
-- fts_lfree(head);
-- (void)closedir(dirp);
-- cur->fts_info = FTS_ERR;
-- SET(FTS_STOP);
-- errno = ENAMETOOLONG;
-- return (NULL);
-- }
-- p->fts_level = level;
-- p->fts_parent = sp->fts_cur;
-- p->fts_pathlen = len + _D_EXACT_NAMLEN (dp);
--
--#if defined FTS_WHITEOUT && 0
-- if (dp->d_type == DT_WHT)
-- p->fts_flags |= FTS_ISW;
--#endif
--
-- if (cderrno) {
-- if (nlinks) {
-- p->fts_info = FTS_NS;
-- p->fts_errno = cderrno;
-- } else
-- p->fts_info = FTS_NSOK;
-- p->fts_accpath = cur->fts_accpath;
-- } else if (nlinks == 0
--#if defined DT_DIR && defined _DIRENT_HAVE_D_TYPE
-- || (nostat &&
-- dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN)
--#endif
-- ) {
-- p->fts_accpath =
-- ISSET(FTS_NOCHDIR) ? p->fts_path : p->fts_name;
-- p->fts_info = FTS_NSOK;
-- } else {
-- /* Build a file name for fts_stat to stat. */
-- if (ISSET(FTS_NOCHDIR)) {
-- p->fts_accpath = p->fts_path;
-- memmove(cp, p->fts_name, p->fts_namelen + 1);
-- } else
-- p->fts_accpath = p->fts_name;
-- /* Stat it. */
-- p->fts_info = fts_stat(sp, p, 0);
--
-- /* Decrement link count if applicable. */
-- if (nlinks > 0 && (p->fts_info == FTS_D ||
-- p->fts_info == FTS_DC || p->fts_info == FTS_DOT))
-- --nlinks;
-- }
--
-- /* We walk in directory order so "ls -f" doesn't get upset. */
-- p->fts_link = NULL;
-- if (head == NULL)
-- head = tail = p;
-- else {
-- tail->fts_link = p;
-- tail = p;
-- }
-- ++nitems;
-- }
-- if (dirp)
-- (void)closedir(dirp);
--
-- /*
-- * If realloc() changed the address of the path, adjust the
-- * addresses for the rest of the tree and the dir list.
-- */
-- if (doadjust)
-- fts_padjust(sp, head);
--
-- /*
-- * If not changing directories, reset the path back to original
-- * state.
-- */
-- if (ISSET(FTS_NOCHDIR)) {
-- if (len == sp->fts_pathlen || nitems == 0)
-- --cp;
-- *cp = '\0';
-- }
--
-- /*
-- * If descended after called from fts_children or after called from
-- * fts_read and nothing found, get back. At the root level we use
-- * the saved fd; if one of fts_open()'s arguments is a relative path
-- * to an empty directory, we wind up here with no other way back. If
-- * can't get back, we're done.
-- */
-- if (descend && nitems == 0 &&
-- (cur->fts_level == FTS_ROOTLEVEL ?
-- FCHDIR(sp, sp->fts_rfd) :
-- fts_safe_changedir(sp, cur->fts_parent, -1, ".."))) {
-- cur->fts_info = FTS_ERR;
-- SET(FTS_STOP);
-- return (NULL);
-- }
--
-- /* If didn't find anything, return NULL. */
-- if (!nitems) {
-- if (type == BREAD)
-- cur->fts_info = FTS_DP;
-- return (NULL);
-- }
--
-- /* Sort the entries. */
-- if (sp->fts_compar && nitems > 1)
-- head = fts_sort(sp, head, nitems);
-- return (head);
--}
--
--static u_short
--fts_stat(sp, p, follow)
-- FTS *sp;
-- register FTSENT *p;
-- int follow;
--{
-- register FTSENT *t;
-- register dev_t dev;
-- register ino_t ino;
-- struct stat *sbp;
-- int saved_errno;
--
-- /* If user needs stat info, stat buffer already allocated. */
-- sbp = p->fts_statp;
--
--#if defined FTS_WHITEOUT && 0
-- /* check for whiteout */
-- if (p->fts_flags & FTS_ISW) {
-- if (sbp != &sb) {
-- memset(sbp, '\0', sizeof (*sbp));
-- sbp->st_mode = S_IFWHT;
-- }
-- return (FTS_W);
-- }
--#endif
--
-- /*
-- * If doing a logical walk, or application requested FTS_FOLLOW, do
-- * a stat(2). If that fails, check for a non-existent symlink. If
-- * fail, set the errno from the stat call.
-- */
-- if (ISSET(FTS_LOGICAL) || follow) {
-- if (stat(p->fts_accpath, sbp)) {
-- saved_errno = errno;
-- if (!lstat(p->fts_accpath, sbp)) {
-- errno = 0;
-- return (FTS_SLNONE);
-- }
-- p->fts_errno = saved_errno;
-- goto err;
-- }
-- } else if (lstat(p->fts_accpath, sbp)) {
-- p->fts_errno = errno;
--err: memset(sbp, 0, sizeof(struct stat));
-- return (FTS_NS);
-- }
--
-- if (S_ISDIR(sbp->st_mode)) {
-- /*
-- * Set the device/inode. Used to find cycles and check for
-- * crossing mount points. Also remember the link count, used
-- * in fts_build to limit the number of stat calls. It is
-- * understood that these fields are only referenced if fts_info
-- * is set to FTS_D.
-- */
-- dev = p->fts_dev = sbp->st_dev;
-- ino = p->fts_ino = sbp->st_ino;
-- p->fts_nlink = sbp->st_nlink;
--
-- if (ISDOT(p->fts_name))
-- return (FTS_DOT);
--
-- /*
-- * Cycle detection is done by brute force when the directory
-- * is first encountered. If the tree gets deep enough or the
-- * number of symbolic links to directories is high enough,
-- * something faster might be worthwhile.
-- */
-- for (t = p->fts_parent;
-- t->fts_level >= FTS_ROOTLEVEL; t = t->fts_parent)
-- if (ino == t->fts_ino && dev == t->fts_dev) {
-- p->fts_cycle = t;
-- return (FTS_DC);
-- }
-- return (FTS_D);
-- }
-- if (S_ISLNK(sbp->st_mode))
-- return (FTS_SL);
-- if (S_ISREG(sbp->st_mode))
-- return (FTS_F);
-- return (FTS_DEFAULT);
--}
--
--static FTSENT *
--fts_sort(sp, head, nitems)
-- FTS *sp;
-- FTSENT *head;
-- register int nitems;
--{
-- register FTSENT **ap, *p;
--
-- /*
-- * Construct an array of pointers to the structures and call qsort(3).
-- * Reassemble the array in the order returned by qsort. If unable to
-- * sort for memory reasons, return the directory entries in their
-- * current order. Allocate enough space for the current needs plus
-- * 40 so don't realloc one entry at a time.
-- */
-- if (nitems > sp->fts_nitems) {
-- struct _ftsent **a;
--
-- sp->fts_nitems = nitems + 40;
-- if ((a = realloc(sp->fts_array,
-- (size_t)(sp->fts_nitems * sizeof(FTSENT *)))) == NULL) {
-- free(sp->fts_array);
-- sp->fts_array = NULL;
-- sp->fts_nitems = 0;
-- return (head);
-- }
-- sp->fts_array = a;
-- }
-- for (ap = sp->fts_array, p = head; p; p = p->fts_link)
-- *ap++ = p;
-- qsort((void *)sp->fts_array, nitems, sizeof(FTSENT *), sp->fts_compar);
-- for (head = *(ap = sp->fts_array); --nitems; ++ap)
-- ap[0]->fts_link = ap[1];
-- ap[0]->fts_link = NULL;
-- return (head);
--}
--
--static FTSENT *
--fts_alloc(sp, name, namelen)
-- FTS *sp;
-- const char *name;
-- register int namelen;
--{
-- register FTSENT *p;
-- size_t len;
--
-- /*
-- * The file name is a variable length array and no stat structure is
-- * necessary if the user has set the nostat bit. Allocate the FTSENT
-- * structure, the file name and the stat structure in one chunk, but
-- * be careful that the stat structure is reasonably aligned. Since the
-- * fts_name field is declared to be of size 1, the fts_name pointer is
-- * namelen + 2 before the first possible address of the stat structure.
-- */
-- len = sizeof(FTSENT) + namelen;
-- len += sizeof(struct stat) + ALIGNBYTES;
-- if ((p = malloc(len)) == NULL)
-- return (NULL);
--
-- /* Copy the name and guarantee NUL termination. */
-- memmove(p->fts_name, name, namelen);
-- p->fts_name[namelen] = '\0';
--
-- p->fts_statp = (struct stat *)ALIGN(p->fts_name + namelen + 2);
-- p->fts_namelen = namelen;
-- p->fts_path = sp->fts_path;
-- p->fts_errno = 0;
-- p->fts_flags = 0;
-- p->fts_instr = FTS_NOINSTR;
-- p->fts_number = 0;
-- p->fts_pointer = NULL;
-- return (p);
--}
--
--static void
--fts_lfree(head)
-- register FTSENT *head;
--{
-- register FTSENT *p;
--
-- /* Free a linked list of structures. */
-- while ((p = head)) {
-- head = head->fts_link;
-- free(p);
-- }
--}
--
--/*
-- * Allow essentially unlimited paths; find, rm, ls should all work on any tree.
-- * Most systems will allow creation of paths much longer than MAXPATHLEN, even
-- * though the kernel won't resolve them. Add the size (not just what's needed)
-- * plus 256 bytes so don't realloc the path 2 bytes at a time.
-- */
--static int
--fts_palloc(sp, more)
-- FTS *sp;
-- size_t more;
--{
-- char *p;
--
-- sp->fts_pathlen += more + 256;
-- /*
-- * Check for possible wraparound. In an FTS, fts_pathlen is
-- * a signed int but in an FTSENT it is an unsigned short.
-- * We limit fts_pathlen to USHRT_MAX to be safe in both cases.
-- */
-- if (sp->fts_pathlen < 0 || sp->fts_pathlen >= 0x10000) {
-- if (sp->fts_path) {
-- free(sp->fts_path);
-- sp->fts_path = NULL;
-- }
-- sp->fts_path = NULL;
-- errno = ENAMETOOLONG;
-- return (1);
-- }
-- p = realloc(sp->fts_path, sp->fts_pathlen);
-- if (p == NULL) {
-- free(sp->fts_path);
-- sp->fts_path = NULL;
-- return 1;
-- }
-- sp->fts_path = p;
-- return 0;
--}
--
--/*
-- * When the path is realloc'd, have to fix all of the pointers in structures
-- * already returned.
-- */
--static void
--fts_padjust(sp, head)
-- FTS *sp;
-- FTSENT *head;
--{
-- FTSENT *p;
-- char *addr = sp->fts_path;
--
--#define ADJUST(p) do { \
-- if ((p)->fts_accpath != (p)->fts_name) { \
-- (p)->fts_accpath = \
-- (char *)addr + ((p)->fts_accpath - (p)->fts_path); \
-- } \
-- (p)->fts_path = addr; \
--} while (0)
-- /* Adjust the current set of children. */
-- for (p = sp->fts_child; p; p = p->fts_link)
-- ADJUST(p);
--
-- /* Adjust the rest of the tree, including the current level. */
-- for (p = head; p->fts_level >= FTS_ROOTLEVEL;) {
-- ADJUST(p);
-- p = p->fts_link ? p->fts_link : p->fts_parent;
-- }
--}
--
--static size_t
--fts_maxarglen(argv)
-- char * const *argv;
--{
-- size_t len, max;
--
-- for (max = 0; *argv; ++argv)
-- if ((len = strlen(*argv)) > max)
-- max = len;
-- return (max + 1);
--}
--
--/*
-- * Change to dir specified by fd or p->fts_accpath without getting
-- * tricked by someone changing the world out from underneath us.
-- * Assumes p->fts_dev and p->fts_ino are filled in.
-- */
--static int
--fts_safe_changedir(sp, p, fd, path)
-- FTS *sp;
-- FTSENT *p;
-- int fd;
-- const char *path;
--{
-- int ret, oerrno, newfd;
-- struct stat sb;
--
-- newfd = fd;
-- if (ISSET(FTS_NOCHDIR))
-- return (0);
-- if (fd < 0 && (newfd = open(path, O_RDONLY, 0)) < 0)
-- return (-1);
-- if (fstat(newfd, &sb)) {
-- ret = -1;
-- goto bail;
-- }
-- if (p->fts_dev != sb.st_dev || p->fts_ino != sb.st_ino) {
-- errno = ENOENT; /* disinformation */
-- ret = -1;
-- goto bail;
-- }
-- ret = fchdir(newfd);
--bail:
-- oerrno = errno;
-- if (fd < 0)
-- (void)close(newfd);
-- errno = oerrno;
-- return (ret);
--}
-diff --git a/lib/fts.h b/lib/fts.h
-deleted file mode 100644
-index 58846b9..0000000
---- a/lib/fts.h
-+++ /dev/null
-@@ -1,131 +0,0 @@
--/*
-- * Copyright (c) 1989, 1993
-- * The Regents of the University of California. All rights reserved.
-- *
-- * Redistribution and use in source and binary forms, with or without
-- * modification, are permitted provided that the following conditions
-- * are met:
-- * 1. Redistributions of source code must retain the above copyright
-- * notice, this list of conditions and the following disclaimer.
-- * 2. Redistributions in binary form must reproduce the above copyright
-- * notice, this list of conditions and the following disclaimer in the
-- * documentation and/or other materials provided with the distribution.
-- * 4. Neither the name of the University nor the names of its contributors
-- * may be used to endorse or promote products derived from this software
-- * without specific prior written permission.
-- *
-- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-- * SUCH DAMAGE.
-- *
-- * @(#)fts.h 8.3 (Berkeley) 8/14/94
-- */
--
--#ifndef _FTS_H
--#define _FTS_H 1
--
--#include <features.h>
--#include <sys/types.h>
--
--typedef struct {
-- struct _ftsent *fts_cur; /* current node */
-- struct _ftsent *fts_child; /* linked list of children */
-- struct _ftsent **fts_array; /* sort array */
-- dev_t fts_dev; /* starting device # */
-- char *fts_path; /* path for this descent */
-- int fts_rfd; /* fd for root */
-- int fts_pathlen; /* sizeof(path) */
-- int fts_nitems; /* elements in the sort array */
-- int (*fts_compar) (const void *, const void *); /* compare fn */
--
--#define FTS_COMFOLLOW 0x0001 /* follow command line symlinks */
--#define FTS_LOGICAL 0x0002 /* logical walk */
--#define FTS_NOCHDIR 0x0004 /* don't change directories */
--#define FTS_NOSTAT 0x0008 /* don't get stat info */
--#define FTS_PHYSICAL 0x0010 /* physical walk */
--#define FTS_SEEDOT 0x0020 /* return dot and dot-dot */
--#define FTS_XDEV 0x0040 /* don't cross devices */
--#define FTS_WHITEOUT 0x0080 /* return whiteout information */
--#define FTS_OPTIONMASK 0x00ff /* valid user option mask */
--
--#define FTS_NAMEONLY 0x0100 /* (private) child names only */
--#define FTS_STOP 0x0200 /* (private) unrecoverable error */
-- int fts_options; /* fts_open options, global flags */
--} FTS;
--
--typedef struct _ftsent {
-- struct _ftsent *fts_cycle; /* cycle node */
-- struct _ftsent *fts_parent; /* parent directory */
-- struct _ftsent *fts_link; /* next file in directory */
-- long fts_number; /* local numeric value */
-- void *fts_pointer; /* local address value */
-- char *fts_accpath; /* access path */
-- char *fts_path; /* root path */
-- int fts_errno; /* errno for this node */
-- int fts_symfd; /* fd for symlink */
-- u_short fts_pathlen; /* strlen(fts_path) */
-- u_short fts_namelen; /* strlen(fts_name) */
--
-- ino_t fts_ino; /* inode */
-- dev_t fts_dev; /* device */
-- nlink_t fts_nlink; /* link count */
--
--#define FTS_ROOTPARENTLEVEL -1
--#define FTS_ROOTLEVEL 0
-- short fts_level; /* depth (-1 to N) */
--
--#define FTS_D 1 /* preorder directory */
--#define FTS_DC 2 /* directory that causes cycles */
--#define FTS_DEFAULT 3 /* none of the above */
--#define FTS_DNR 4 /* unreadable directory */
--#define FTS_DOT 5 /* dot or dot-dot */
--#define FTS_DP 6 /* postorder directory */
--#define FTS_ERR 7 /* error; errno is set */
--#define FTS_F 8 /* regular file */
--#define FTS_INIT 9 /* initialized only */
--#define FTS_NS 10 /* stat(2) failed */
--#define FTS_NSOK 11 /* no stat(2) requested */
--#define FTS_SL 12 /* symbolic link */
--#define FTS_SLNONE 13 /* symbolic link without target */
--#define FTS_W 14 /* whiteout object */
-- u_short fts_info; /* user flags for FTSENT structure */
--
--#define FTS_DONTCHDIR 0x01 /* don't chdir .. to the parent */
--#define FTS_SYMFOLLOW 0x02 /* followed a symlink to get here */
-- u_short fts_flags; /* private flags for FTSENT structure */
--
--#define FTS_AGAIN 1 /* read node again */
--#define FTS_FOLLOW 2 /* follow symbolic link */
--#define FTS_NOINSTR 3 /* no instructions */
--#define FTS_SKIP 4 /* discard node */
-- u_short fts_instr; /* fts_set() instructions */
--
-- struct stat *fts_statp; /* stat(2) information */
-- char fts_name[1]; /* file name */
--} FTSENT;
--
--__BEGIN_DECLS
--
--#define fts_children pax_fts_children
--#define fts_close pax_fts_close
--#define fts_open pax_fts_open
--#define fts_read pax_fts_read
--#define fts_set pax_fts_set
--
--FTSENT *fts_children (FTS *, int);
--int fts_close (FTS *);
--FTS *fts_open (char * const *, int,
-- int (*)(const FTSENT **, const FTSENT **));
--FTSENT *fts_read (FTS *);
--int fts_set (FTS *, FTSENT *, int) __THROW;
--__END_DECLS
--
--#endif /* fts.h */
-diff --git a/lib/vis.h b/lib/vis.h
-index d34d342..71fa5f4 100644
---- a/lib/vis.h
-+++ b/lib/vis.h
-@@ -73,14 +73,19 @@
- */
- #define UNVIS_END 1 /* no more characters */
-
--#include <sys/cdefs.h>
-+#ifndef __P
-+#define __P(x) x
-+#endif
-
--__BEGIN_DECLS
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- char *vis __P((char *, int, int, int));
- int strvis __P((char *, const char *, int));
- int strvisx __P((char *, const char *, size_t, int));
- int strunvis __P((char *, const char *));
- int unvis __P((char *, char, int *, int));
--__END_DECLS
--
-+#ifdef __cplusplus
-+}
-+#endif
- #endif /* !_VIS_H_ */
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 5ef52a3..227cdef 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -22,4 +22,4 @@ pax_SOURCES = ar_io.c ar_subs.c buf_subs.c cache.c cpio.c\
- file_subs.c ftree.c gen_subs.c getoldopt.c options.c\
- pat_rep.c pax.c sel_subs.c tables.c tar.c tty_subs.c
-
--pax_LDADD = $(top_builddir)/lib/libbsdfunc.a
-+pax_LDADD = $(top_builddir)/lib/libbsdfunc.a -lfts
-diff --git a/src/extern.h b/src/extern.h
-index 361fa81..3ed365d 100644
---- a/src/extern.h
-+++ b/src/extern.h
-@@ -37,8 +37,6 @@
- * External references from each source file
- */
-
--#include <sys/cdefs.h>
--
- /*
- * ar_io.c
- */
-diff --git a/src/file_subs.c b/src/file_subs.c
-index 5590ff1..15bc339 100644
---- a/src/file_subs.c
-+++ b/src/file_subs.c
-@@ -52,7 +52,7 @@
- #include "extern.h"
-
- static int
--mk_link __P((register char *,register struct stat *,register char *, int));
-+mk_link (register char *,register struct stat *,register char *, int);
-
- /*
- * routines that deal with file operations such as: creating, removing;
-diff --git a/src/tables.c b/src/tables.c
-index 2275bf7..8fddca4 100644
---- a/src/tables.c
-+++ b/src/tables.c
-@@ -39,7 +39,7 @@
- #include <sys/time.h>
- #include <sys/stat.h>
- #include <sys/param.h>
--#include <sys/fcntl.h>
-+#include <fcntl.h>
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
---
-2.6.4
-
diff --git a/meta/recipes-extended/pax/pax/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch b/meta/recipes-extended/pax/pax/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch
deleted file mode 100644
index 1d969bc34af..00000000000
--- a/meta/recipes-extended/pax/pax/0001-include-sys-sysmacros.h-for-major-minor-definitions.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 7f4f379f8343c0ce92aa30f3f9037288a089a902 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 18 Dec 2016 08:24:56 +0000
-Subject: [PATCH] include <sys/sysmacros.h> for major/minor definitions
-
-glibc 2.25 will error out if the applications are expecting
-this to come from sys/types.h, it is being removed from
-there.
-
-Fixes
-
-error: In the GNU C Library, "minor" is defined
-| by <sys/sysmacros.h>. For historical compatibility, it is
-| currently defined by <sys/types.h> as well, but we plan to
-| remove this soon. To use "minor", include <sys/sysmacros.h>
-| directly. If you did not intend to use a system-defined macro
-| "minor", you should undefine it after including <sys/types.h>. [-Werror]
-| ul_oct ((u_long) MINOR (arcn->sb.st_rdev), hd->devminor,
-| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- src/cpio.c | 2 +-
- src/gen_subs.c | 2 +-
- src/tar.c | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-Index: pax-3.4/src/cpio.c
-===================================================================
---- pax-3.4.orig/src/cpio.c
-+++ pax-3.4/src/cpio.c
-@@ -36,6 +36,7 @@
- #include "config.h"
- #endif
-
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/stat.h>
-Index: pax-3.4/src/gen_subs.c
-===================================================================
---- pax-3.4.orig/src/gen_subs.c
-+++ pax-3.4/src/gen_subs.c
-@@ -37,6 +37,7 @@
- #include "config.h"
- #endif
-
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/stat.h>
-Index: pax-3.4/src/tar.c
-===================================================================
---- pax-3.4.orig/src/tar.c
-+++ pax-3.4/src/tar.c
-@@ -37,6 +37,7 @@
- #include "config.h"
- #endif
-
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/stat.h>
diff --git a/meta/recipes-extended/pax/pax/0001-use-strtoll-instead-of-strtoq.patch b/meta/recipes-extended/pax/pax/0001-use-strtoll-instead-of-strtoq.patch
deleted file mode 100644
index 58ac9ce4a0e..00000000000
--- a/meta/recipes-extended/pax/pax/0001-use-strtoll-instead-of-strtoq.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From b1f50320332c9c90fa33ab136ef0ec2d12cda461 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 6 Jan 2016 12:30:52 -0800
-Subject: [PATCH] use strtoll instead of strtoq
-
-Use LLONG_MAX instead of LONG_LONG_MAX
-LONG_LONG_MAX is GNU specific
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Pending
-
- src/options.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/options.c b/src/options.c
-index da8b4cf..c663b4e 100644
---- a/src/options.c
-+++ b/src/options.c
-@@ -1547,8 +1547,8 @@ str_offt (char *val)
-
- #if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
- || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
-- num = strtoq (val, &expr, 0);
-- if ((num == LONG_LONG_MAX) || (num <= 0) || (expr == val))
-+ num = strtoll (val, &expr, 0);
-+ if ((num == LLONG_MAX) || (num <= 0) || (expr == val))
- #else
- num = strtol (val, &expr, 0);
- if ((num == LONG_MAX) || (num <= 0) || (expr == val))
---
-2.6.4
-
diff --git a/meta/recipes-extended/pax/pax/fix_for_compile_with_gcc-4.6.0.patch b/meta/recipes-extended/pax/pax/fix_for_compile_with_gcc-4.6.0.patch
deleted file mode 100644
index 88779c3bbd0..00000000000
--- a/meta/recipes-extended/pax/pax/fix_for_compile_with_gcc-4.6.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-Status: Pending
-
-This patch fixes this compiler error with gcc 4.6.0
-
-Nitin A Kamble <nitin.a.kamble@intel.com> 2011/05/08
-
-| fts.c: In function 'pax_fts_set':
-| fts.c:469:7: error: parameter 'sp' set but not used [-Werror=unused-but-set-parameter]
-| cc1: all warnings being treated as errors
-|
-| make[2]: *** [fts.o] Error 1
-
-Index: pax-3.4/lib/fts.c
-===================================================================
---- pax-3.4.orig/lib/fts.c
-+++ pax-3.4/lib/fts.c
-@@ -466,7 +466,7 @@ name: t = sp->fts_path + NAPPEND(p->fts
- /* ARGSUSED */
- int
- fts_set(sp, p, instr)
-- FTS *sp;
-+ FTS __attribute__((__unused__)) *sp;
- FTSENT *p;
- int instr;
- {
diff --git a/meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch b/meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch
deleted file mode 100644
index 7adbd02972e..00000000000
--- a/meta/recipes-extended/pax/pax/pax-3.4_fix_for_x32.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-Upstream-Status: Pending
-
-Author: H.J. Lu <hjl.tools@gmail.com>
-Date: Tue Dec 6 10:34:53 2011 -0800
-
- Fix pax-3.4 build for x32
-
- off_t is 8byte for x32. We need to check both _FILE_OFFSET_BITS and
- size of off_t to see if file offset is 64bit. This patch adds
- AC_CHECK_SIZEOF(off_t) and checks SIZEOF_OFF_T == 8.
-
-Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/06
-
-Index: pax-3.4/configure.in
-===================================================================
---- pax-3.4.orig/configure.in
-+++ pax-3.4/configure.in
-@@ -33,4 +33,7 @@ dnl Checks for header files.
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
-
-+AC_CHECK_SIZEOF(off_t)
-+AC_CHECK_SIZEOF(long)
-+
- AC_OUTPUT([Makefile lib/Makefile src/Makefile])
-Index: pax-3.4/src/ar_io.c
-===================================================================
---- pax-3.4.orig/src/ar_io.c
-+++ pax-3.4/src/ar_io.c
-@@ -378,7 +378,8 @@ ar_close(void)
- * could have written anything yet.
- */
- if (frmt == NULL) {
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- (void)fprintf(listf, "%s: unknown format, %qu bytes skipped.\n",
- #else
- (void)fprintf(listf, "%s: unknown format, %lu bytes skipped.\n",
-@@ -391,7 +392,8 @@ ar_close(void)
-
- if (strcmp(NM_CPIO, argv0) == 0)
- (void)fprintf(listf,
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- "%qu blocks\n",
- #else
- "%lu blocks\n",
-@@ -399,7 +401,8 @@ ar_close(void)
- (rdcnt ? rdcnt : wrcnt) / 5120);
- else if (strcmp(NM_TAR, argv0) != 0)
- (void)fprintf(listf,
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- "%s: %s vol %d, %lu files, %qu bytes read, %qu bytes written.\n",
- #else
- "%s: %s vol %d, %lu files, %lu bytes read, %lu bytes written.\n",
-Index: pax-3.4/src/cpio.c
-===================================================================
---- pax-3.4.orig/src/cpio.c
-+++ pax-3.4/src/cpio.c
-@@ -218,7 +218,8 @@ rd_ln_nm (ARCHD *arcn)
- */
- if ((arcn->sb.st_size == 0) ||
- (arcn->sb.st_size >= (off_t) sizeof(arcn->ln_name))) {
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- paxwarn (1, "Cpio link name length is invalid: %qu",
- arcn->sb.st_size);
- #else
-Index: pax-3.4/src/gen_subs.c
-===================================================================
---- pax-3.4.orig/src/gen_subs.c
-+++ pax-3.4/src/gen_subs.c
-@@ -133,7 +133,8 @@ ls_list (ARCHD *arcn, time_t now, FILE *
- * print device id's for devices, or sizes for other nodes
- */
- if ((arcn->type == PAX_CHR) || (arcn->type == PAX_BLK))
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- (void) fprintf (fp, "%4lu,%4lu ", (unsigned long) MAJOR (sbp->st_rdev),
- (unsigned long) MINOR (sbp->st_rdev));
- #else
-@@ -142,7 +143,8 @@ ls_list (ARCHD *arcn, time_t now, FILE *
- #endif
- else
- {
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- (void) fprintf (fp, "%9qu ", sbp->st_size);
- #else
- (void) fprintf (fp, "%9lu ", sbp->st_size);
-@@ -334,7 +336,8 @@ ul_asc (u_long val, char *str, int len,
- return (0);
- }
-
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- /*
- * asc_uqd()
- * convert hex/octal character string into a u_quad_t. We do not have to
-Index: pax-3.4/src/options.c
-===================================================================
---- pax-3.4.orig/src/options.c
-+++ pax-3.4/src/options.c
-@@ -1545,7 +1545,8 @@ str_offt (char *val)
- char *expr;
- off_t num, t;
-
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- num = strtoq (val, &expr, 0);
- if ((num == LONG_LONG_MAX) || (num <= 0) || (expr == val))
- #else
-Index: pax-3.4/src/tar.c
-===================================================================
---- pax-3.4.orig/src/tar.c
-+++ pax-3.4/src/tar.c
-@@ -58,7 +58,8 @@
- static unsigned long tar_chksm (char *, int);
- static char *name_split (char *, int);
- static int ul_oct (u_long, char *, int, int);
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- static int uqd_oct (u_quad_t, char *, int, int);
- #endif
-
-@@ -196,7 +197,8 @@ ul_oct (u_long val, register char *str,
- return (0);
- }
-
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- /*
- * uqd_oct()
- * convert an u_quad_t to an octal string. one of many oddball field
-@@ -427,7 +429,8 @@ tar_rd (ARCHD *arcn, char *buf)
- 0xfff);
- arcn->sb.st_uid = (uid_t) asc_ul (hd->uid, sizeof (hd->uid), OCT);
- arcn->sb.st_gid = (gid_t) asc_ul (hd->gid, sizeof (hd->gid), OCT);
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- arcn->sb.st_size = (off_t) asc_uqd (hd->size, sizeof (hd->size), OCT);
- #else
- arcn->sb.st_size = (off_t) asc_ul (hd->size, sizeof (hd->size), OCT);
-@@ -659,7 +662,8 @@ tar_wr (register ARCHD * arcn)
- * data follows this file, so set the pad
- */
- hd->linkflag = AREGTYPE;
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- if (uqd_oct ((u_quad_t) arcn->sb.st_size, hd->size,
- sizeof (hd->size), 1))
- #else
-@@ -834,7 +838,8 @@ ustar_rd (ARCHD *arcn, char *buf)
- */
- arcn->sb.st_mode = (mode_t) (asc_ul (hd->mode, sizeof (hd->mode), OCT) &
- 0xfff);
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- arcn->sb.st_size = (off_t) asc_uqd (hd->size, sizeof (hd->size), OCT);
- #else
- arcn->sb.st_size = (off_t) asc_ul (hd->size, sizeof (hd->size), OCT);
-@@ -1081,7 +1086,8 @@ ustar_wr (register ARCHD * arcn)
- else
- hd->typeflag = REGTYPE;
- arcn->pad = TAR_PAD (arcn->sb.st_size);
--#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
-+#if (SIZEOF_LONG == 4 && SIZEOF_OFF_T == 8) \
-+ || (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64)
- if (uqd_oct ((u_quad_t) arcn->sb.st_size, hd->size,
- sizeof (hd->size), 3))
- {
diff --git a/meta/recipes-extended/pax/pax_3.4.bb b/meta/recipes-extended/pax/pax_3.4.bb
deleted file mode 100644
index 6df9a8186b6..00000000000
--- a/meta/recipes-extended/pax/pax_3.4.bb
+++ /dev/null
@@ -1,31 +0,0 @@
-SUMMARY = "Portable Archive eXchange"
-DESCRIPTION = "pax (Portable Archive eXchange) is the POSIX standard archive tool"
-HOMEPAGE = "http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/bin/pax/"
-BUGTRACKER = "http://www.openbsd.org/query-pr.html"
-
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4b0b674dfdc56daa3832d4069b820ea0 \
- file://src/pax.h;endline=40;md5=309d3e241c1d82069228e5a51e9b8d60 \
- file://src/cpio.h;endline=40;md5=c3b4bbff6133a83387968617bbae8ac4 \
- file://lib/vis.h;endline=40;md5=b283f759abd4a5ad7e014b80f51fc053"
-
-SECTION = "base"
-PR = "r2"
-
-DEPENDS_append_libc-musl = " fts "
-
-SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/${BPN}/${BP}.tar.bz2/fbd9023b590b45ac3ade95870702a0d6/${BP}.tar.bz2 \
- file://fix_for_compile_with_gcc-4.6.0.patch \
- file://pax-3.4_fix_for_x32.patch \
- file://0001-include-sys-sysmacros.h-for-major-minor-definitions.patch \
- file://0001-Add-a-comment-for-fallthrough.patch \
- "
-
-SRC_URI_append_libc-musl = " file://0001-Fix-build-with-musl.patch \
- file://0001-use-strtoll-instead-of-strtoq.patch \
- "
-
-SRC_URI[md5sum] = "fbd9023b590b45ac3ade95870702a0d6"
-SRC_URI[sha256sum] = "ac3c06048e02828077cf7757d3d142241429238893b91d529af29a2e8cc5623b"
-
-inherit autotools
--
2.15.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 05/10] image-live.bbclass: drop support for compressed ISO images
2018-02-12 11:05 [PATCH 01/10] cryptodev: switch SRC_URI to git Alexander Kanavin
` (2 preceding siblings ...)
2018-02-12 11:05 ` [PATCH 04/10] pax: remove the recipe Alexander Kanavin
@ 2018-02-12 11:05 ` Alexander Kanavin
2018-02-12 11:05 ` [PATCH 06/10] libpipeline: add a recipe Alexander Kanavin
` (4 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Alexander Kanavin @ 2018-02-12 11:05 UTC (permalink / raw)
To: openembedded-core
While modern Linux kernels still support it, the userspace tools
haven't been updated in over a decade. Also, squashfs provides
both better performance, and better compression ratio:
https://elinux.org/Squash_Fs_Comparisons
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/classes/image-live.bbclass | 17 ++---------------
meta/conf/distro/include/maintainers.inc | 1 -
.../zisofs-tools/zisofs-tools-native_1.0.8.bb | 20 --------------------
3 files changed, 2 insertions(+), 36 deletions(-)
delete mode 100644 meta/recipes-devtools/zisofs-tools/zisofs-tools-native_1.0.8.bb
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index 1623c15988b..966277c6785 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -19,7 +19,6 @@
# External variables (also used by syslinux.bbclass)
# ${INITRD} - indicates a list of filesystem images to concatenate and use as an initrd (optional)
-# ${COMPRESSISO} - Transparent compress ISO, reduce size ~40% if set to 1
# ${NOISO} - skip building the ISO image if set to 1
# ${NOHDD} - skip building the HDD image if set to 1
# ${HDDIMG_ID} - FAT image volume-id
@@ -33,7 +32,6 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \
virtual/kernel:do_deploy \
${MLPREFIX}syslinux:do_populate_sysroot \
syslinux-native:do_populate_sysroot \
- ${@oe.utils.ifelse(d.getVar('COMPRESSISO', False),'zisofs-tools-native:do_populate_sysroot','')} \
${PN}:do_image_${@d.getVar('LIVE_ROOTFS_TYPE').replace('-', '_')} \
"
@@ -65,7 +63,6 @@ HDDDIR = "${S}/hddimg"
ISODIR = "${S}/iso"
EFIIMGDIR = "${S}/efi_img"
COMPACT_ISODIR = "${S}/iso.z"
-COMPRESSISO ?= "0"
ISOLINUXDIR ?= "/isolinux"
ISO_BOOTIMG = "isolinux/isolinux.bin"
@@ -115,18 +112,8 @@ build_iso() {
install -m 0644 ${STAGING_DATADIR}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR}
fi
- if [ "${COMPRESSISO}" = "1" ] ; then
- # create compact directory, compress iso
- mkdir -p ${COMPACT_ISODIR}
- mkzftree -z 9 -p 4 -F ${ISODIR}/rootfs.img ${COMPACT_ISODIR}/rootfs.img
-
- # move compact iso to iso, then remove compact directory
- mv ${COMPACT_ISODIR}/rootfs.img ${ISODIR}/rootfs.img
- rm -Rf ${COMPACT_ISODIR}
- mkisofs_compress_opts="-R -z -D -l"
- else
- mkisofs_compress_opts="-r"
- fi
+ # We used to have support for zisofs; this is a relic of that
+ mkisofs_compress_opts="-r"
# Check the size of ${ISODIR}/rootfs.img, use mkisofs -iso-level 3
# when it exceeds 3.8GB, the specification is 4G - 1 bytes, we need
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 16a15a3865e..24bf6b96a7e 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -803,5 +803,4 @@ RECIPE_MAINTAINER_pn-xwininfo = "Armin Kuster <akuster@mvista.com>"
RECIPE_MAINTAINER_pn-xz = "Denys Dmytriyenko <denys@ti.com>"
RECIPE_MAINTAINER_pn-yasm = "Yi Zhao <yi.zhao@windriver.com>"
RECIPE_MAINTAINER_pn-zip = "Denys Dmytriyenko <denys@ti.com>"
-RECIPE_MAINTAINER_pn-zisofs-tools-native = "Alexander Kanavin <alexander.kanavin@intel.com>"
RECIPE_MAINTAINER_pn-zlib = "Denys Dmytriyenko <denys@ti.com>"
diff --git a/meta/recipes-devtools/zisofs-tools/zisofs-tools-native_1.0.8.bb b/meta/recipes-devtools/zisofs-tools/zisofs-tools-native_1.0.8.bb
deleted file mode 100644
index 021c05839c0..00000000000
--- a/meta/recipes-devtools/zisofs-tools/zisofs-tools-native_1.0.8.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-# zisofs-tools-native OE build file
-# Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-SUMMARY = "Utilities for creating compressed CD-ROM filesystems"
-HOMEPAGE = "http://freecode.com/projects/zisofs-tools"
-SECTION = "console/utils"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-DEPENDS = "zlib-native"
-
-SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/zisofs-tools/zisofs-tools-${PV}.tar.bz2/2d0ed8c9a1f60b45f949b136f9be1f6c/zisofs-tools-${PV}.tar.bz2"
-
-SRC_URI[md5sum] = "2d0ed8c9a1f60b45f949b136f9be1f6c"
-SRC_URI[sha256sum] = "ae4e53e4914934d41660248fb59d3c8761f1f1fd180d5ec993c17ddb3afd04f3"
-
-inherit native
-
-do_install() {
- oe_runmake install INSTALLROOT=${D} bindir=${bindir}
-}
--
2.15.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 06/10] libpipeline: add a recipe
2018-02-12 11:05 [PATCH 01/10] cryptodev: switch SRC_URI to git Alexander Kanavin
` (3 preceding siblings ...)
2018-02-12 11:05 ` [PATCH 05/10] image-live.bbclass: drop support for compressed ISO images Alexander Kanavin
@ 2018-02-12 11:05 ` Alexander Kanavin
2018-02-12 11:05 ` [PATCH 07/10] man-db: replace the outdated man implementation Alexander Kanavin
` (3 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Alexander Kanavin @ 2018-02-12 11:05 UTC (permalink / raw)
To: openembedded-core
This is a hard dependency of man-db, which will be added in the following commit.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-extended/libpipeline/libpipeline_1.5.0.bb | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 meta/recipes-extended/libpipeline/libpipeline_1.5.0.bb
diff --git a/meta/recipes-extended/libpipeline/libpipeline_1.5.0.bb b/meta/recipes-extended/libpipeline/libpipeline_1.5.0.bb
new file mode 100644
index 00000000000..14cc9e519a8
--- /dev/null
+++ b/meta/recipes-extended/libpipeline/libpipeline_1.5.0.bb
@@ -0,0 +1,14 @@
+SUMMARY = "pipeline manipulation library"
+DESCRIPTION = "This is a C library for setting up and running pipelines of processes, \
+without needing to involve shell command-line parsing which is often \
+error-prone and insecure."
+HOMEPAGE = "http://libpipeline.nongnu.org/"
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+SRC_URI = "${SAVANNAH_GNU_MIRROR}/libpipeline/libpipeline-${PV}.tar.gz"
+SRC_URI[md5sum] = "b7437a5020190cfa84f09c412db38902"
+SRC_URI[sha256sum] = "0d72e12e4f2afff67fd7b9df0a24d7ba42b5a7c9211ac5b3dcccc5cd8b286f2b"
+
+inherit pkgconfig autotools
+
--
2.15.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 07/10] man-db: replace the outdated man implementation
2018-02-12 11:05 [PATCH 01/10] cryptodev: switch SRC_URI to git Alexander Kanavin
` (4 preceding siblings ...)
2018-02-12 11:05 ` [PATCH 06/10] libpipeline: add a recipe Alexander Kanavin
@ 2018-02-12 11:05 ` Alexander Kanavin
2018-02-21 20:07 ` Burton, Ross
` (3 more replies)
2018-02-12 11:05 ` [PATCH 08/10] oe-selftest: fix tests to reflect man->man-db transition Alexander Kanavin
` (2 subsequent siblings)
8 siblings, 4 replies; 16+ messages in thread
From: Alexander Kanavin @ 2018-02-12 11:05 UTC (permalink / raw)
To: openembedded-core
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 86151 bytes --]
Until now oe-core has been using a well obsolete implementation of man.
Man-db on the other hand is used by all modern Linux distros, is actively
maintained, has a standard build system, and does not require 30 patches
to build.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-extended/man-db/man-db_2.8.1.bb | 41 ++++++
meta/recipes-extended/man/man/configure_sed.patch | 32 -----
.../man/man/man-1.5g-nonrootbuild.patch | 16 ---
.../man/man/man-1.5h1-gencat.patch | 14 --
meta/recipes-extended/man/man/man-1.5h1-make.patch | 17 ---
.../man/man/man-1.5i2-initial.patch | 19 ---
.../man/man/man-1.5i2-newline.patch | 15 --
.../man/man/man-1.5i2-overflow.patch | 16 ---
meta/recipes-extended/man/man/man-1.5j-i18n.patch | 16 ---
.../man/man/man-1.5j-nocache.patch | 16 ---
meta/recipes-extended/man/man/man-1.5j-utf8.patch | 61 --------
.../man/man/man-1.5k-confpath.patch | 15 --
.../man/man/man-1.5k-nonascii.patch | 18 ---
meta/recipes-extended/man/man/man-1.5k-sofix.patch | 24 ----
.../man/man/man-1.5m2-bug11621.patch | 15 --
.../man/man/man-1.5m2-buildroot.patch | 52 -------
.../man/man/man-1.5m2-no-color-for-printing.patch | 15 --
.../man/man/man-1.5m2-sigpipe.patch | 30 ----
.../man/man/man-1.6e-i18n_whatis.patch | 145 -------------------
.../man/man/man-1.6e-mandirs.patch | 31 ----
.../man/man/man-1.6e-new_sections.patch | 15 --
.../recipes-extended/man/man/man-1.6e-ro_usr.patch | 33 -----
.../man/man/man-1.6e-security.patch | 62 --------
.../man/man-1.6e-use_i18n_vars_in_a_std_way.patch | 160 ---------------------
.../man/man/man-1.6e-whatis2.patch | 59 --------
.../man/man/man-1.6g-compile-warnings.patch | 105 --------------
.../man/man/man-1.6g-configure.patch | 68 ---------
.../man/man/man-1.6g-parallel.patch | 30 ----
.../man/man/man-1.6g-whatis3.patch | 20 ---
meta/recipes-extended/man/man/man.1.gz | Bin 12323 -> 0 bytes
meta/recipes-extended/man/man/man.7.gz | Bin 6192 -> 0 bytes
meta/recipes-extended/man/man/man.conf | 141 ------------------
meta/recipes-extended/man/man/manpath.5.gz | Bin 2133 -> 0 bytes
meta/recipes-extended/man/man_1.6g.bb | 86 -----------
34 files changed, 41 insertions(+), 1346 deletions(-)
create mode 100644 meta/recipes-extended/man-db/man-db_2.8.1.bb
delete mode 100644 meta/recipes-extended/man/man/configure_sed.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.5h1-gencat.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.5h1-make.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.5i2-initial.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.5i2-newline.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.5i2-overflow.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.5j-i18n.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.5j-nocache.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.5j-utf8.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.5k-confpath.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.5k-nonascii.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.5k-sofix.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.6e-mandirs.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.6e-new_sections.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.6e-security.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.6e-whatis2.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.6g-configure.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.6g-parallel.patch
delete mode 100644 meta/recipes-extended/man/man/man-1.6g-whatis3.patch
delete mode 100644 meta/recipes-extended/man/man/man.1.gz
delete mode 100644 meta/recipes-extended/man/man/man.7.gz
delete mode 100644 meta/recipes-extended/man/man/man.conf
delete mode 100644 meta/recipes-extended/man/man/manpath.5.gz
delete mode 100644 meta/recipes-extended/man/man_1.6g.bb
diff --git a/meta/recipes-extended/man-db/man-db_2.8.1.bb b/meta/recipes-extended/man-db/man-db_2.8.1.bb
new file mode 100644
index 00000000000..4e633acd09e
--- /dev/null
+++ b/meta/recipes-extended/man-db/man-db_2.8.1.bb
@@ -0,0 +1,41 @@
+SUMMARY = "An implementation of the standard Unix documentation system accessed using the man command"
+HOMEPAGE = "http://man-db.nongnu.org/"
+LICENSE = "LGPLv2.1 & GPLv2"
+LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
+ file://docs/COPYING;md5=eb723b61539feef013de476e68b5c50a"
+
+SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz"
+SRC_URI[md5sum] = "51842978e06686286421f9498d1009b7"
+SRC_URI[sha256sum] = "a6aec641ca3d9942b054cc0e9c3f05cb46a3a992bc0006795755e2fed1357f3e"
+
+DEPENDS = "libpipeline gdbm groff-native less"
+
+# | /usr/src/debug/man-db/2.8.0-r0/man-db-2.8.0/src/whatis.c:939: undefined reference to `_nl_msg_cat_cntr'
+USE_NLS_libc-musl = "no"
+
+inherit gettext pkgconfig autotools
+
+EXTRA_OECONF = "--with-pager=less --disable-cache-owner"
+
+do_install_append_libc-musl() {
+ rm -f ${D}${libdir}/charset.alias
+}
+
+FILES_${PN} += "${libdir}/tmpfiles.d"
+
+FILES_${PN}-dev += "${libdir}/${PN}/libman.so ${libdir}/${PN}/libmandb.so"
+
+RPROVIDES_${PN} += " man"
+
+def compress_pkg(d):
+ if "compress_doc" in (d.getVar("INHERIT") or "").split():
+ compress = d.getVar("DOC_COMPRESS")
+ if compress == "gz":
+ return "gzip"
+ elif compress == "bz2":
+ return "bzip2"
+ elif compress == "xz":
+ return "xz"
+ return ""
+
+RDEPENDS_${PN} += "${@compress_pkg(d)}"
diff --git a/meta/recipes-extended/man/man/configure_sed.patch b/meta/recipes-extended/man/man/configure_sed.patch
deleted file mode 100644
index d49e6831d9a..00000000000
--- a/meta/recipes-extended/man/man/configure_sed.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-man: replace ',' with '#'
-
-Sometimes, the parameters of CC/BUILD_CC contains the ',', which
-cause the sed command failed, so replace the ',' with '#'
-
-Upstream-Status: Pending
-
-Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
-Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
----
- configure | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure b/configure
-index 9f62cf9..9a565ae 100755
---- a/configure
-+++ b/configure
-@@ -1321,9 +1321,9 @@ do
- echo "Creating $infile from $infile.in"
- sed -e '
- s,@version@,$version,
--s,@CC@,$CC,
-+s#@CC@#$CC#
- s,@EXEEXT@,$EXEEXT,
--s,@BUILD_CC@,$BUILD_CC,
-+s#@BUILD_CC@#$BUILD_CC#
- s,@INSTALL@,$INSTALL,
- s,@DEFS@,$DEFS,
- s,@LIBS@,$LIBS,
---
-1.9.1
-
diff --git a/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch b/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
deleted file mode 100644
index 6f834bd01bd..00000000000
--- a/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
-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/man-1.5h1-gencat.patch b/meta/recipes-extended/man/man/man-1.5h1-gencat.patch
deleted file mode 100644
index 044b14c5099..00000000000
--- a/meta/recipes-extended/man/man/man-1.5h1-gencat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
---- 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 <stdio.h>
- #include <stdlib.h>
- #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
deleted file mode 100644
index 8631eb2c539..00000000000
--- a/meta/recipes-extended/man/man/man-1.5h1-make.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
---- 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/man-1.5i2-initial.patch b/meta/recipes-extended/man/man/man-1.5i2-initial.patch
deleted file mode 100644
index fe56c0706ca..00000000000
--- a/meta/recipes-extended/man/man/man-1.5i2-initial.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
---- 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/man-1.5i2-newline.patch b/meta/recipes-extended/man/man/man-1.5i2-newline.patch
deleted file mode 100644
index 611df5d2594..00000000000
--- a/meta/recipes-extended/man/man/man-1.5i2-newline.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
---- 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)<BUFSIZE)
- end++; /* note that buf is NUL-terminated */
- *end = '\0';
-
diff --git a/meta/recipes-extended/man/man/man-1.5i2-overflow.patch b/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
deleted file mode 100644
index 52d2881a893..00000000000
--- a/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
---- man-1.5i2/src/man.c.overflow Mon Jun 25 00:01:45 2001
-+++ man-1.5i2/src/man.c Mon Jun 25 00:01:45 2001
-@@ -381,6 +381,9 @@
- strcat(name, "/");
- strcat(name, beg);
- }
-+ /* If this is too long, bad things have already happened. *
-+ * we should quit IMMEDIATELY. */
-+ if(strlen(name)>sizeof(ultname)) _exit(1);
-
- goto again;
- }
diff --git a/meta/recipes-extended/man/man/man-1.5j-i18n.patch b/meta/recipes-extended/man/man/man-1.5j-i18n.patch
deleted file mode 100644
index 2ae09c0ea49..00000000000
--- a/meta/recipes-extended/man/man/man-1.5j-i18n.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
---- 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/man-1.5j-nocache.patch b/meta/recipes-extended/man/man/man-1.5j-nocache.patch
deleted file mode 100644
index 751dddd53b5..00000000000
--- a/meta/recipes-extended/man/man/man-1.5j-nocache.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
---- 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/man-1.5j-utf8.patch b/meta/recipes-extended/man/man/man-1.5j-utf8.patch
deleted file mode 100644
index 33d3e4c9745..00000000000
--- a/meta/recipes-extended/man/man/man-1.5j-utf8.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
---- 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/man-1.5k-confpath.patch b/meta/recipes-extended/man/man/man-1.5k-confpath.patch
deleted file mode 100644
index b5746c2df80..00000000000
--- a/meta/recipes-extended/man/man/man-1.5k-confpath.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
---- 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/man-1.5k-nonascii.patch b/meta/recipes-extended/man/man/man-1.5k-nonascii.patch
deleted file mode 100644
index d662d9b6a70..00000000000
--- a/meta/recipes-extended/man/man/man-1.5k-nonascii.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
---- ./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/man-1.5k-sofix.patch b/meta/recipes-extended/man/man/man-1.5k-sofix.patch
deleted file mode 100644
index 50b925288ec..00000000000
--- a/meta/recipes-extended/man/man/man-1.5k-sofix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
---- 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/man-1.5m2-bug11621.patch b/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
deleted file mode 100644
index 051299906b8..00000000000
--- a/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
---- ./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/man-1.5m2-buildroot.patch b/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
deleted file mode 100644
index bc97f56b9af..00000000000
--- a/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
---- ./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/man-1.5m2-no-color-for-printing.patch b/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
deleted file mode 100644
index c85ff1d8c72..00000000000
--- a/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
---- 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/man-1.5m2-sigpipe.patch b/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
deleted file mode 100644
index 8af78eab7b1..00000000000
--- a/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
---- 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/man-1.6e-i18n_whatis.patch b/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
deleted file mode 100644
index e321325d63f..00000000000
--- a/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
-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/man-1.6e-mandirs.patch b/meta/recipes-extended/man/man/man-1.6e-mandirs.patch
deleted file mode 100644
index b240064c980..00000000000
--- a/meta/recipes-extended/man/man/man-1.6e-mandirs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
---- 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/man-1.6e-new_sections.patch b/meta/recipes-extended/man/man/man-1.6e-new_sections.patch
deleted file mode 100644
index fb9773c646e..00000000000
--- a/meta/recipes-extended/man/man/man-1.6e-new_sections.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
---- 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/man-1.6e-ro_usr.patch b/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
deleted file mode 100644
index 1d1cb0c724c..00000000000
--- a/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
-Index: man-1.6f/src/makewhatis.sh
-===================================================================
---- man-1.6f.orig/src/makewhatis.sh 2010-12-29 13:42:34.000000000 -0800
-+++ man-1.6f/src/makewhatis.sh 2010-12-29 13:42:35.667428347 -0800
-@@ -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
diff --git a/meta/recipes-extended/man/man/man-1.6e-security.patch b/meta/recipes-extended/man/man/man-1.6e-security.patch
deleted file mode 100644
index 312a882f063..00000000000
--- a/meta/recipes-extended/man/man/man-1.6e-security.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
-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/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
deleted file mode 100644
index 568f742100c..00000000000
--- a/meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
-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 <string.h> */
- 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/man-1.6e-whatis2.patch b/meta/recipes-extended/man/man/man-1.6e-whatis2.patch
deleted file mode 100644
index fc4ed3135dd..00000000000
--- a/meta/recipes-extended/man/man/man-1.6e-whatis2.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Upstream-Status: Pending
-
-Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-
-Index: man-1.6f/src/makewhatis.sh
-===================================================================
---- man-1.6f.orig/src/makewhatis.sh 2010-12-29 13:51:45.000000000 -0800
-+++ man-1.6f/src/makewhatis.sh 2010-12-29 13:59:35.399799412 -0800
-@@ -164,10 +164,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
-@@ -180,13 +185,7 @@
- echo "about to enter $mandir" > /dev/stderr
- fi
-
-- # kludge for Slackware's /usr/man/preformat
-- if [ $mandir = /usr/man/preformat ]
-- then
-- mandir1=/usr/man
-- else
-- mandir1=$mandir
-- fi
-+ mandir1=$WHATIS_DIR
-
- # if $mandir is on a readonly partition, and the whatis file
- # is not a symlink, then let's skip trying to update it
-@@ -207,11 +206,6 @@
- fi
- 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
-@@ -447,7 +447,6 @@
-
- chmod 644 ${mandir1}/whatis
- rm $TMPFILE
-- fi
- done
- done
diff --git a/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch b/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch
deleted file mode 100644
index 4631d2d0635..00000000000
--- a/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Fix a build error when building man.config.5 (a remnant of a long
-ago previous patch). Optimized the manpages Makefile for parallel
-builds. Also, fix compile warnings in a couple other files.
-
-Upstream-Status: Pending
-
-Signed-off-by: Bill Randle <william.c.randle@intel.com>
-
---- man-1.6g/man/Makefile.in.orig 2016-03-28 17:31:08.723949180 -0700
-+++ man-1.6g/man/Makefile.in 2016-03-28 17:46:12.866910386 -0700
-@@ -5,6 +5,13 @@
- ALL = man.1 whatis.1 apropos.1 man.config.5
- MAYBE8 = makewhatis
-
-+SUBDIRS := $(shell echo @languages@)
-+
-+.PHONY: subdirs $(SUBDIRS)
-+
-+man.config.man: man.conf.man
-+ @cp $< $@
-+
- .SUFFIXES: .man .1 .5 .8
-
- .man.1:
-@@ -19,11 +26,11 @@
- INSTALL = @INSTALL@ -c -m 644
-
- # Where to put the manual pages.
--mandir = $(DESTDIR)$(PREFIX)@mandir@$(SLANG)
-+mandir := $(DESTDIR)$(PREFIX)@mandir@$(SLANG)
-
- all: $(ALL)
- for i in $(MAYBE8); \
-- do if test -f $$i.man; then make -f ../Makefile $$i.8; fi; done
-+ do if test -f $$i.man; then $(MAKE) -f ../Makefile $$i.8; fi; done
-
- install: $(ALL)
- mkdir -p $(mandir)/man1 $(mandir)/man5 $(mandir)/man8
-@@ -38,24 +45,27 @@
- rm -f core *.in *.@man1ext@ *.@man5ext@ *.@man8ext@ *~
-
- spotless:
-+ rm -f man.config.man
-
- subdirs:
-- @for i in @languages@; do if test -d $$i; then echo; \
-- echo "==== Making the `cat $$i.txt` man pages. ===="; \
-- cd $$i; make -f ../Makefile; cd ..; \
-- else echo "==== No $$i man pages found. ===="; fi; done
-+subdirs: $(SUBDIRS)
-+$(SUBDIRS):
-+ if test -d $@; then echo; \
-+ echo "==== Making the `cat $@.txt` man pages. ===="; \
-+ $(MAKE) -C $@ -f ../Makefile all; \
-+ else echo "==== No $@ man pages found. ===="; fi
-
- installsubdirs:
- @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; cd ..; \
- else echo "==== No $$i man pages found. ===="; fi; done
-
- cleansubdirs:
-- @for i in ??; do cd $$i; make -f ../Makefile clean; cd ..; done
-+ @for i in ??; do $(MAKE) -C $$i -f ../Makefile clean; done
- rm -f core *~
-
- spotlesssubdirs:
-- for i in ??; do cd $$i; make -f ../Makefile spotless; cd ..; done
-+ for i in ??; do $(MAKE) -C $$i -f ../Makefile spotless; done
- rm -f Makefile
-
---- man-1.6g/src/gripes.c.orig 2006-11-21 11:53:44.000000000 -0800
-+++ man-1.6g/src/gripes.c 2016-03-30 16:32:31.601103487 -0700
-@@ -7,8 +7,6 @@
-
- extern char *msg[];
-
--static char *mantexts = "man"; /* e.g. /usr/lib/locale/%L/man.cat */
--
- #ifdef NONLS
-
- static char *
-@@ -30,6 +28,8 @@
- #include <nl_types.h>
- #include "../catopen/catopen.c"
-
-+static char *mantexts = "man"; /* e.g. /usr/lib/locale/%L/man.cat */
-+
- nl_catd catfd = (nl_catd) -1;
- int cat_is_open = 0;
-
---- man-1.6g/src/manfile.c.orig 2005-08-20 16:26:06.000000000 -0700
-+++ man-1.6g/src/manfile.c 2016-03-29 09:10:21.527841285 -0700
-@@ -299,7 +299,7 @@
- const char *((*tocat)(const char *man_filename, const char *ext,
- int flags))) {
- char **sl;
-- struct manpage *res;
-+ struct manpage *res = 0;
-
- standards = (flags & (FHS | FSSTND | DO_HP | DO_IRIX));
- to_cat_filename = tocat;
diff --git a/meta/recipes-extended/man/man/man-1.6g-configure.patch b/meta/recipes-extended/man/man/man-1.6g-configure.patch
deleted file mode 100644
index 106cc987819..00000000000
--- a/meta/recipes-extended/man/man/man-1.6g-configure.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Use BUILD_CC and target include files for configuration tests.
-If cross-compiling, force pathnames for helper programs, since
-autodiscovery by the configure script will not work.
-
-Upstream-Status: Pending
-
-Signed-off-by: Bill Randle <william.c.randle at intel.com>
-
---- man-1.6g/configure.orig 2016-03-28 17:46:12.734910976 -0700
-+++ man-1.6g/configure 2016-03-30 21:47:45.110572908 -0700
-@@ -216,7 +216,8 @@
- INCLUDEDIR=${INCLUDEDIR-/usr/include}
-
- rm -f conftest conftest.c
--compile="$CC $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1"
-+# since we are interested in target feature support, use that sysroot
-+compile="$BUILD_CC -isystem/${PKG_CONFIG_SYSROOT_DIR}/usr/include $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1"
-
- # Check for various header files.
-
-@@ -455,19 +456,23 @@
- fi
- 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
-- 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
-+ if [ $BUILD_CC != $CC ]; then
-+ # cross compiling => target fs not available, so force defaults
-+ Fgroff=/usr/bin/groff
-+ Fnroff=/usr/bin/nroff
-+ Fjnroff=/usr/bin/nroff
-+ Fgeqn=/usr/bin/eqn
-+ Fgneqn=/usr/bin/neqn
-+ Fgtbl=/usr/bin/tbl
-+ Fcol=/usr/bin/col
-+ Fgrefer=/usr/bin/refer
-+ Fgpic=/usr/bin/pic
-+ Fmore=/bin/more
-+ Fless=/usr/bin/less
-+ Fcmp=/usr/bin/cmp
-+ Fcat=/bin/cat
-+ Fgawk=/usr/bin/gawk
-+ fi
-
-
- for i in eqn tbl refer pic
-@@ -507,8 +512,8 @@
- jnroff="$Fjnroff -Tutf8 -mandocj"
- fi
- eqn="$Fgeqn -Tps"
-- neqn="$Fgeqn -Tutf8"
-- jneqn="$Fgeqn -Tutf8"
-+ neqn="$Fgneqn -Tutf8"
-+ jneqn="$Fgneqn -Tutf8"
- tbl="$Fgtbl"
- col="$Fcol"
- vgrind="$Fvgrind"
diff --git a/meta/recipes-extended/man/man/man-1.6g-parallel.patch b/meta/recipes-extended/man/man/man-1.6g-parallel.patch
deleted file mode 100644
index 72a88b898a1..00000000000
--- a/meta/recipes-extended/man/man/man-1.6g-parallel.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-The Makefile for man has a rule to create two generated targets with
-a program run from the shell. Because the rule was run twice, with
-parallel make, the generated files were being overwritten at the same
-time they were being compiled. This patch forces the rule to be run
-only once.
-
-Upstream-Status: Pending
-
-Signed-off-by: Bill Randle <william.c.randle at intel.com>
-
---- man-1.6g/src/Makefile.in.orig 2010-12-31 12:28:46.000000000 -0800
-+++ man-1.6g/src/Makefile.in 2016-03-28 09:09:16.845458798 -0700
-@@ -43,8 +43,10 @@
- makemsg:
- $(BUILD_CC) -o makemsg makemsg.c
-
--msg.c gripedefs.h: ../msgs/mess.en makemsg
-+msg.c gripedefs.h: genfiles-stamp
-+genfiles-stamp: ../msgs/mess.en makemsg
- ./makemsg ../msgs/mess.en gripedefs.h msg.c
-+ touch genfiles-stamp
-
- # glob.c does not have prototypes
- glob.o: glob.c ndir.h
-@@ -117,4 +119,4 @@
-
- spotless: clean
- rm -f Makefile config.status paths.h version.h man.conf
-- rm -f gripedefs.h msg.c mess.*.cat
-+ rm -f gripedefs.h msg.c mess.*.cat genfiles-stamp
diff --git a/meta/recipes-extended/man/man/man-1.6g-whatis3.patch b/meta/recipes-extended/man/man/man-1.6g-whatis3.patch
deleted file mode 100644
index 63344568575..00000000000
--- a/meta/recipes-extended/man/man/man-1.6g-whatis3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Do not use absolute path for awk while getting the path of awk
-when running makewhatis.
-This can avoid errors if path of awk changes.
-
-Upstream-Status: Submitted [man-1.6g]
-
-Signed-off-by: Jian Liu <jian.liu@windriver.com>
-
-diff -Nur man-1.6g.orig/src/makewhatis.sh man-1.6g/src/makewhatis.sh
---- man-1.6g.orig/src/makewhatis.sh 2015-02-25 16:13:12.657611419 +0800
-+++ man-1.6g/src/makewhatis.sh 2015-02-25 16:14:49.334694815 +0800
-@@ -67,7 +67,7 @@
- # but that leads to problems and bugs.
-
- # AWK=/usr/bin/gawk
--AWK=@awk@
-+AWK=`which awk`
-
- # Find a place for our temporary files. If security is not a concern, use
- # TMPFILE=/tmp/whatis$$; TMPFILEDIR=none
diff --git a/meta/recipes-extended/man/man/man.1.gz b/meta/recipes-extended/man/man/man.1.gz
deleted file mode 100644
index c368045153406ab730aad35bfc7ffd91238bd47d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 12323
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
J#~S#D004`l-XQ=0
diff --git a/meta/recipes-extended/man/man/man.7.gz b/meta/recipes-extended/man/man/man.7.gz
deleted file mode 100644
index e85af82426507521badb6f5c425896385f469b5a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 6192
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
OO8yVmcsMtKI{*OKZ6#>{
diff --git a/meta/recipes-extended/man/man/man.conf b/meta/recipes-extended/man/man/man.conf
deleted file mode 100644
index fc10be2758d..00000000000
--- a/meta/recipes-extended/man/man/man.conf
+++ /dev/null
@@ -1,141 +0,0 @@
-#
-# Generated automatically from man.conf.in by the
-# configure script.
-#
-# man.conf from man-1.5p
-#
-# For more information about this file, see the man pages man(1)
-# and man.conf(5).
-#
-# This file is read by man to configure the default manpath (also used
-# when MANPATH contains an empty substring), to find out where the cat
-# pages corresponding to given man pages should be stored,
-# and to map each PATH element to a manpath element.
-# It may also record the pathname of the man binary. [This is unused.]
-# The format is:
-#
-# MANBIN pathname
-# MANPATH manpath_element [corresponding_catdir]
-# MANPATH_MAP path_element manpath_element
-#
-# If no catdir is given, it is assumed to be equal to the mandir
-# (so that this dir has both man1 etc. and cat1 etc. subdirs).
-# This is the traditional Unix setup.
-# Certain versions of the FSSTND recommend putting formatted versions
-# of /usr/.../man/manx/page.x into /var/catman/.../catx/page.x.
-# The keyword FSSTND will cause this behaviour.
-# Certain versions of the FHS recommend putting formatted versions of
-# /usr/.../share/man/[locale/]manx/page.x into
-# /var/cache/man/.../[locale/]catx/page.x.
-# The keyword FHS will cause this behaviour (and overrides FSSTND).
-# Explicitly given catdirs override.
-#
-# FSSTND
-FHS
-#
-# This file is also read by man in order to find how to call nroff, less, etc.,
-# and to determine the correspondence between extensions and decompressors.
-#
-# MANBIN /usr/local/bin/man
-#
-# Every automatically generated MANPATH includes these fields
-#
-MANPATH /usr/man
-MANPATH /usr/share/man
-MANPATH /usr/local/man
-MANPATH /usr/local/share/man
-MANPATH /usr/X11R6/man
-#
-# Uncomment if you want to include one of these by default
-#
-# MANPATH /opt/*/man
-# MANPATH /usr/lib/*/man
-# MANPATH /usr/share/*/man
-# MANPATH /usr/kerberos/man
-#
-# Set up PATH to MANPATH mapping
-#
-# If people ask for "man foo" and have "/dir/bin/foo" in their PATH
-# and the docs are found in "/dir/man", then no mapping is required.
-#
-# The below mappings are superfluous when the right hand side is
-# in the mandatory manpath already, but will keep man from statting
-# lots of other nearby files and directories.
-#
-MANPATH_MAP /bin /usr/share/man
-MANPATH_MAP /sbin /usr/share/man
-MANPATH_MAP /usr/bin /usr/share/man
-MANPATH_MAP /usr/sbin /usr/share/man
-MANPATH_MAP /usr/local/bin /usr/local/share/man
-MANPATH_MAP /usr/local/sbin /usr/local/share/man
-MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man
-MANPATH_MAP /usr/bin/X11 /usr/X11R6/man
-MANPATH_MAP /usr/bin/mh /usr/share/man
-#
-# NOAUTOPATH keeps man from automatically adding directories that look like
-# manual page directories to the path.
-#
-#NOAUTOPATH
-#
-# NOCACHE keeps man from creating cache pages ("cat pages")
-# (generally one enables/disable cat page creation by creating/deleting
-# the directory they would live in - man never does mkdir)
-#
-#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.
-# For use with utf-8, NROFF should be "nroff -mandoc" without -T option.
-# (Maybe - but today I need -Tlatin1 to prevent double conversion to utf8.)
-#
-# If you have a new troff (version 1.18.1?) and its colored output
-# causes problems, add the -c option to TROFF, NROFF, JNROFF.
-#
-TROFF /usr/bin/groff -Tps -mandoc
-NROFF /usr/bin/nroff -Tlatin1 -mandoc
-JNROFF /usr/bin/groff -Tnippon -mandocj
-EQN /usr/bin/eqn -Tps
-NEQN /usr/bin/eqn -Tlatin1
-JNEQN /usr/bin/eqn -Tnippon
-TBL /usr/bin/tbl
-# COL /usr/bin/col
-REFER /usr/bin/refer
-PIC /usr/bin/pic
-VGRIND
-GRAP
-PAGER /usr/bin/less -isR
-CAT /bin/cat
-#
-# The command "man -a xyzzy" will show all man pages for xyzzy.
-# When CMP is defined man will try to avoid showing the same
-# text twice. (But compressed pages compare unequal.)
-#
-CMP /usr/bin/cmp -s
-#
-# Compress cat pages
-#
-COMPRESS /bin/bzip2
-COMPRESS_EXT .bz2
-#
-# Default manual sections (and order) to search if -S is not specified
-# and the MANSECT environment variable is not set.
-#
-MANSECT 1:1p:8:2:3:3p:4:5:6:7:9:0p:tcl:n:l:p:o
-#
-# Default options to use when man is invoked without options
-# This is mainly for the benefit of those that think -a should be the default
-# Note that some systems have /usr/man/allman, causing pages to be shown twice.
-#
-#MANDEFOPTIONS -a
-#
-# Decompress with given decompressor when input file has given extension
-# The command given must act as a filter.
-#
-.gz /bin/gunzip -c
-.bz2 /usr/bin/bunzip2 -c
-.xz /usr/bin/unxz -c
-.z
-.Z /bin/zcat
-.F
-.Y
diff --git a/meta/recipes-extended/man/man/manpath.5.gz b/meta/recipes-extended/man/man/manpath.5.gz
deleted file mode 100644
index c012ff89763bb057afaaaed3b616244748354fec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2133
zcmV-b2&(rViwFP!000021HD&WZ`(K)eb=wJ$Sg21;3#oBZIkZH=BufJ#tC8<onpM`
z(h_BJD^UU|#r2{;e$OQ-$##;#JPpv;t|(sKd(OEZjOPb*D>PMNDJd%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<IIU7rD^i35kZCB_~md)L6)+(wYrB;S21dUn2Ht59(mW0}N<OBh$D$
z2Z&sq&+Z<+ert6+Z^{2AbLr0i<WFXF0UV>$%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+H<ut4tocYsyoo^)6%z7$GDaz3D;6#y?@?+
zcL=bH{PwV@^key*vzV7r!)ARzFCD-vHMVi!`&!^3_C1#6#;Fq7#+|a8JHvMQI4_Z6
z{48Rhx|e<*jUL{HG~<HGjIsxy&Xfh%=s9~%*z6mZM6aUY7c!?;R(KY;tBpvNmlCl@
z{L}fkC+3L93G6NlRoAShXtuS}Ihl*Z=ft{I9xDpn1m)kg46gT7YM@piWm(-G;pi#C
zn)fFHoOFr93V>o;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<?WN_^1d
z)6@}-?A+he%k(&v->$CX)6+L+Bi7-$ebS+Q^<X5pFY<KbzJsg)9g=NrSS&ik9`&&^
zC(K$qHo4yAYfZB_>bY~+mabm(51ovo9FrxFBFb3I5AL0{;)#{ZQc@b`0rqPI*B1Li
zq#*xXll&oy%8zDz@(x^Ekw-;i{cwxjaQVeHcy;|@Jh?^(glgt2#YR3?^;4NKM1``6
z%rR2Pvax$ruN{}{KT);3I<ZSMdHq~@%(`Ku+xOC}X`*h}<W3;F)=sVcFh!Kk7JC-z
zJ&OI7td>SrUBRjsISqzRU9A<=S{Jo2%f?SVuDP<0t-Y?XPOmR{fOdT{8(R>D$oPNp
z{3riI@=gB)$6jX;-A+pgrnZ`3WF?D-3zr{KQ4W2n<eUhOgz}*tabVE#Q_%ga+J>tv
zCdT`F=V`37C|IHqY0Bx8UegJ^!p-D2I-|GrE{ZdScdy+ZI8wlds&e^)6YSv<zx1%J
zU_LNn@!L+<aFY8X7X}_Iz3J^n0l{P0hP37O;KIXiHUxeJ>eHxL4LDJQRrq01;5K0d
zcTpQ@yX#Tw3U(}HUSdQ8(@t6>vy79kE8Jl=-QZH{s=t<g=8``u+&2|Z;LeZEOUn}o
zzrN;a1aE?NRN9@89P@EBZK-xnZdnM_w|&~pdjCbe_69wi1?Jv1kmyjx%a{&E3<Q{q
z<M?3U(d@~Yx`7D8MHOZ<uKb}WgD29WXtNS8c1*^e^LA(+PcF}AU&dE%)?cf%UbQzT
zzM3m;sO~8vm-8IMvyw|V|9BYnLxE$98D$-Wnek9%Tx2ZT!+?8#$E2sH*Djr&Y|rw)
z|8=*P?kMy3c=n82T#Ec}Cun{2KWWM#?VT?2wb)p8!1t{>++9T<QBbqXvdCE+Lgq_h
zQipt4_R*DlX!xG*#1#g}cFGRo^Ea;`zi^Rtc_j4Gjio5mtgbCZ_}Y5$utP@+1x@ZQ
z&o4h-hfzKkOB7XH`A}xv9_~tqqe0{*MTdENL-(NU+zb6p`Qr1<6q8Dj8C+|)iHHTR
z)UN#a>obd;FCBhp;;R4#7wg8Fm-|ewfUMEJSRi9kX_aXS52xWAzQO}1G+V9-zLNbP
L!Vpl2a}xjn5ok8&
diff --git a/meta/recipes-extended/man/man_1.6g.bb b/meta/recipes-extended/man/man_1.6g.bb
deleted file mode 100644
index ff603f842c1..00000000000
--- a/meta/recipes-extended/man/man_1.6g.bb
+++ /dev/null
@@ -1,86 +0,0 @@
-SUMMARY = "Online documentation tools"
-DESCRIPTION = "A set of documentation tools: man, apropos and whatis"
-SECTION = "console/utils"
-HOMEPAGE = "http://primates.ximian.com/~flucifredi/man"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-
-PR = "r1"
-
-DEPENDS = "groff less"
-
-def compress_pkg(d):
- if "compress_doc" in (d.getVar("INHERIT") or "").split():
- compress = d.getVar("DOC_COMPRESS")
- if compress == "gz":
- return "gzip"
- elif compress == "bz2":
- return "bzip2"
- elif compress == "xz":
- return "xz"
- return ""
-
-RDEPENDS_${PN} += "${@compress_pkg(d)}"
-
-SRC_URI = "http://pkgs.fedoraproject.org/lookaside/pkgs/man2html/${BP}.tar.gz/ba154d5796928b841c9c69f0ae376660/${BP}.tar.gz \
- file://man-1.5k-confpath.patch;striplevel=0 \
- file://man-1.5h1-make.patch \
- file://man-1.5k-nonascii.patch \
- file://man-1.6e-security.patch \
- file://man-1.6e-mandirs.patch \
- file://man-1.5m2-bug11621.patch \
- file://man-1.5k-sofix.patch \
- file://man-1.5m2-buildroot.patch \
- file://man-1.6e-ro_usr.patch \
- file://man-1.5i2-newline.patch;striplevel=0 \
- file://man-1.5j-utf8.patch \
- file://man-1.5i2-overflow.patch \
- file://man-1.5j-nocache.patch \
- file://man-1.5i2-initial.patch \
- file://man-1.5h1-gencat.patch;striplevel=0 \
- file://man-1.5g-nonrootbuild.patch \
- file://man-1.5j-i18n.patch \
- file://man-1.6e-whatis2.patch \
- file://man-1.6e-use_i18n_vars_in_a_std_way.patch \
- file://man-1.5m2-no-color-for-printing.patch \
- file://man-1.5m2-sigpipe.patch \
- file://man-1.6e-i18n_whatis.patch \
- file://man-1.6e-new_sections.patch \
- file://man.1.gz;unpack=false \
- file://man.7.gz;unpack=false \
- file://man.conf \
- file://manpath.5.gz;unpack=false \
- file://man-1.6g-whatis3.patch \
- file://configure_sed.patch \
- file://man-1.6g-parallel.patch \
- file://man-1.6g-compile-warnings.patch \
- file://man-1.6g-configure.patch \
-"
-
-SRC_URI[md5sum] = "ba154d5796928b841c9c69f0ae376660"
-SRC_URI[sha256sum] = "ccdcb8c3f4e0080923d7e818f0e4a202db26c46415eaef361387c20995b8959f"
-
-CFLAGS += "-DSYSV"
-
-do_configure () {
- ${S}/configure -default -confdir /etc +sgid +fhs +lang all
-}
-
-
-do_install() {
- oe_runmake install DESTDIR=${D}
-}
-
-do_install_append(){
- mkdir -p ${D}${sysconfdir}
- mkdir -p ${D}${datadir}/man/man5
- mkdir -p ${D}${datadir}/man/man7
- cp ${WORKDIR}/man.conf ${D}${sysconfdir}/man.config
- 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/
-}
-
-
-RDEPENDS_${PN} = "less groff"
-FILES_${PN} += "${datadir}/locale ${sysconfdir}/man.config"
--
2.15.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 08/10] oe-selftest: fix tests to reflect man->man-db transition
2018-02-12 11:05 [PATCH 01/10] cryptodev: switch SRC_URI to git Alexander Kanavin
` (5 preceding siblings ...)
2018-02-12 11:05 ` [PATCH 07/10] man-db: replace the outdated man implementation Alexander Kanavin
@ 2018-02-12 11:05 ` Alexander Kanavin
2018-02-12 11:05 ` [PATCH 09/10] maintainers.inc: add missing entries Alexander Kanavin
2018-02-12 11:05 ` [PATCH 10/10] oe-selftest: add a test for recipes without maintainers Alexander Kanavin
8 siblings, 0 replies; 16+ messages in thread
From: Alexander Kanavin @ 2018-02-12 11:05 UTC (permalink / raw)
To: openembedded-core
Rather than apply a patch twice, an incorrect patch is applied
(as the new man-db recipe does not have any patches yet).
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
.../man-db/files/0001-Test-patch-here.patch | 22 ++++++++++++++++
.../man_1.6g.bbappend => man-db/man-db_%.bbappend} | 0
.../recipes-test/man/man/man-1.5h1-make.patch | 16 ------------
meta/lib/oeqa/selftest/cases/bbtests.py | 29 +++++++++++-----------
4 files changed, 36 insertions(+), 31 deletions(-)
create mode 100644 meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch
rename meta-selftest/recipes-test/{man/man_1.6g.bbappend => man-db/man-db_%.bbappend} (100%)
delete mode 100644 meta-selftest/recipes-test/man/man/man-1.5h1-make.patch
diff --git a/meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch b/meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch
new file mode 100644
index 00000000000..b1d5eab2b8c
--- /dev/null
+++ b/meta-selftest/recipes-test/man-db/files/0001-Test-patch-here.patch
@@ -0,0 +1,22 @@
+From efc8831f33106e6b48de8e612c2d816fe7d1ae68 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 9 Feb 2018 17:37:48 +0200
+Subject: [PATCH] Test patch here!
+
+This is an invalid patch used by oe-selftest
+---
+ README | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/README b/README
+index 48fff57..26d1234 100644
+--- a/README
++++ b/README
+@@ -1,3 +1,4 @@
++This is a test patch for purposes of oe-selftest
+ THIS LINE MAKES THIS PATCH INVALID README for the man-db manual pager suite
+ ========================================
+
+--
+2.15.1
+
diff --git a/meta-selftest/recipes-test/man/man_1.6g.bbappend b/meta-selftest/recipes-test/man-db/man-db_%.bbappend
similarity index 100%
rename from meta-selftest/recipes-test/man/man_1.6g.bbappend
rename to meta-selftest/recipes-test/man-db/man-db_%.bbappend
diff --git a/meta-selftest/recipes-test/man/man/man-1.5h1-make.patch b/meta-selftest/recipes-test/man/man/man-1.5h1-make.patch
deleted file mode 100644
index a0d59b78cef..00000000000
--- a/meta-selftest/recipes-test/man/man/man-1.5h1-make.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Test patch here!
-This is invalid patch used by tests in scripts/lib/selftests.
-
---- 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 @@
- #MAKE THIS PATCH INVALID
- 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/lib/oeqa/selftest/cases/bbtests.py b/meta/lib/oeqa/selftest/cases/bbtests.py
index 4c82049032b..350614967c9 100644
--- a/meta/lib/oeqa/selftest/cases/bbtests.py
+++ b/meta/lib/oeqa/selftest/cases/bbtests.py
@@ -64,15 +64,14 @@ class BitbakeTests(OESelftestTestCase):
@OETestID(108)
def test_invalid_patch(self):
- # This patch already exists in SRC_URI so adding it again will cause the
- # patch to fail.
- self.write_recipeinc('man', 'SRC_URI += "file://man-1.5h1-make.patch"')
+ # This patch should fail to apply.
+ self.write_recipeinc('man-db', 'FILESEXTRAPATHS_prepend := "${THISDIR}/files:"\nSRC_URI += "file://0001-Test-patch-here.patch"')
self.write_config("INHERIT_remove = \"report-error\"")
- result = bitbake('man -c patch', ignore_status=True)
- self.delete_recipeinc('man')
- bitbake('-cclean man')
+ result = bitbake('man-db -c patch', ignore_status=True)
+ self.delete_recipeinc('man-db')
+ bitbake('-cclean man-db')
line = self.getline(result, "Function failed: patch_do_patch")
- self.assertTrue(line and line.startswith("ERROR:"), msg = "Repeated patch application didn't fail. bitbake output: %s" % result.output)
+ self.assertTrue(line and line.startswith("ERROR:"), msg = "Incorrectly formed patch application didn't fail. bitbake output: %s" % result.output)
@OETestID(1354)
def test_force_task_1(self):
@@ -132,17 +131,17 @@ class BitbakeTests(OESelftestTestCase):
@OETestID(168)
def test_invalid_recipe_src_uri(self):
data = 'SRC_URI = "file://invalid"'
- self.write_recipeinc('man', data)
+ self.write_recipeinc('man-db', data)
self.write_config("""DL_DIR = \"${TOPDIR}/download-selftest\"
SSTATE_DIR = \"${TOPDIR}/download-selftest\"
INHERIT_remove = \"report-error\"
""")
self.track_for_cleanup(os.path.join(self.builddir, "download-selftest"))
- bitbake('-ccleanall man')
- result = bitbake('-c fetch man', ignore_status=True)
- bitbake('-ccleanall man')
- self.delete_recipeinc('man')
+ bitbake('-ccleanall man-db')
+ result = bitbake('-c fetch man-db', ignore_status=True)
+ bitbake('-ccleanall man-db')
+ self.delete_recipeinc('man-db')
self.assertEqual(result.status, 1, msg="Command succeded when it should have failed. bitbake output: %s" % result.output)
self.assertTrue('Fetcher failure: Unable to find file file://invalid anywhere. The paths that were searched were:' in result.output, msg = "\"invalid\" file \
doesn't exist, yet no error message encountered. bitbake output: %s" % result.output)
@@ -222,9 +221,9 @@ SSTATE_DIR = \"${TOPDIR}/download-selftest\"
INHERIT_remove = \"report-error\"
""")
self.track_for_cleanup(os.path.join(self.builddir, "download-selftest"))
- self.write_recipeinc('man',"\ndo_fail_task () {\nexit 1 \n}\n\naddtask do_fail_task before do_fetch\n" )
- runCmd('bitbake -c cleanall man xcursor-transparent-theme')
- result = runCmd('bitbake -c unpack -k man xcursor-transparent-theme', ignore_status=True)
+ self.write_recipeinc('man-db',"\ndo_fail_task () {\nexit 1 \n}\n\naddtask do_fail_task before do_fetch\n" )
+ runCmd('bitbake -c cleanall man-db xcursor-transparent-theme')
+ result = runCmd('bitbake -c unpack -k man-db xcursor-transparent-theme', ignore_status=True)
errorpos = result.output.find('ERROR: Function failed: do_fail_task')
manver = re.search("NOTE: recipe xcursor-transparent-theme-(.*?): task do_unpack: Started", result.output)
continuepos = result.output.find('NOTE: recipe xcursor-transparent-theme-%s: task do_unpack: Started' % manver.group(1))
--
2.15.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 09/10] maintainers.inc: add missing entries
2018-02-12 11:05 [PATCH 01/10] cryptodev: switch SRC_URI to git Alexander Kanavin
` (6 preceding siblings ...)
2018-02-12 11:05 ` [PATCH 08/10] oe-selftest: fix tests to reflect man->man-db transition Alexander Kanavin
@ 2018-02-12 11:05 ` Alexander Kanavin
2018-02-12 11:05 ` [PATCH 10/10] oe-selftest: add a test for recipes without maintainers Alexander Kanavin
8 siblings, 0 replies; 16+ messages in thread
From: Alexander Kanavin @ 2018-02-12 11:05 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/conf/distro/include/maintainers.inc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 24bf6b96a7e..add094e2e37 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -212,6 +212,7 @@ RECIPE_MAINTAINER_pn-glibc-initial = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER_pn-glibc-locale = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER_pn-glibc-mtrace = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER_pn-glibc-scripts = "Khem Raj <raj.khem@gmail.com>"
+RECIPE_MAINTAINER_pn-glide = "Otavio Salvador <otavio.salvador@ossystems.com.br>"
RECIPE_MAINTAINER_pn-glproto = "Armin Kuster <akuster@mvista.com>"
RECIPE_MAINTAINER_pn-gmp = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER_pn-gnome-common = "Maxin B. John <maxin.john@intel.com>"
@@ -375,6 +376,7 @@ RECIPE_MAINTAINER_pn-libpciaccess = "Alexander Kanavin <alexander.kanavin@intel.
RECIPE_MAINTAINER_pn-libpcre = "Yi Zhao <yi.zhao@windriver.com>"
RECIPE_MAINTAINER_pn-libpcre2 = "Armin Kuster <akuster@mvista.com>"
RECIPE_MAINTAINER_pn-libpfm4 = "Matthew McClintock <msm@freescale.com>"
+RECIPE_MAINTAINER_pn-libpipeline = "Alexander Kanavin <alexander.kanavin@intel.com>"
RECIPE_MAINTAINER_pn-libpng = "Maxin B. John <maxin.john@intel.com>"
RECIPE_MAINTAINER_pn-libpng12 = "Maxin B. John <maxin.john@intel.com>"
RECIPE_MAINTAINER_pn-libpod-plainer-perl = "Maxin B. John <maxin.john@intel.com>"
@@ -478,7 +480,7 @@ RECIPE_MAINTAINER_pn-m4-native = "Robert Yang <liezhi.yang@windriver.com>"
RECIPE_MAINTAINER_pn-make = "Robert Yang <liezhi.yang@windriver.com>"
RECIPE_MAINTAINER_pn-makedepend = "Robert Yang <liezhi.yang@windriver.com>"
RECIPE_MAINTAINER_pn-makedevs = "Chen Qi <Qi.Chen@windriver.com>"
-RECIPE_MAINTAINER_pn-man = "Hongxu Jia <hongxu.jia@windriver.com>"
+RECIPE_MAINTAINER_pn-man-db = "Hongxu Jia <hongxu.jia@windriver.com>"
RECIPE_MAINTAINER_pn-man-pages = "Hongxu Jia <hongxu.jia@windriver.com>"
RECIPE_MAINTAINER_pn-matchbox-config-gtk = "Maxin B. John <maxin.john@intel.com>"
RECIPE_MAINTAINER_pn-matchbox-desktop = "Maxin B. John <maxin.john@intel.com>"
--
2.15.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 10/10] oe-selftest: add a test for recipes without maintainers
2018-02-12 11:05 [PATCH 01/10] cryptodev: switch SRC_URI to git Alexander Kanavin
` (7 preceding siblings ...)
2018-02-12 11:05 ` [PATCH 09/10] maintainers.inc: add missing entries Alexander Kanavin
@ 2018-02-12 11:05 ` Alexander Kanavin
8 siblings, 0 replies; 16+ messages in thread
From: Alexander Kanavin @ 2018-02-12 11:05 UTC (permalink / raw)
To: openembedded-core
'bitbake -c checkpkg world' is moved to class initializer to avoid
it being run twice in a row.
The no-maintainers test checks only oe-core recipes, as other layers
may be be configured, and assigning maintainership to specific people via
maintainers.inc is known to be used only in oe-core.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/lib/oeqa/selftest/cases/distrodata.py | 67 +++++++++++++++++++++++++++---
1 file changed, 62 insertions(+), 5 deletions(-)
diff --git a/meta/lib/oeqa/selftest/cases/distrodata.py b/meta/lib/oeqa/selftest/cases/distrodata.py
index 12540adc7d8..7b2800464cb 100644
--- a/meta/lib/oeqa/selftest/cases/distrodata.py
+++ b/meta/lib/oeqa/selftest/cases/distrodata.py
@@ -9,6 +9,11 @@ class Distrodata(OESelftestTestCase):
@classmethod
def setUpClass(cls):
super(Distrodata, cls).setUpClass()
+ feature = 'INHERIT += "distrodata"\n'
+ feature += 'LICENSE_FLAGS_WHITELIST += " commercial"\n'
+
+ cls.write_config(cls, feature)
+ bitbake('-c checkpkg world')
@OETestID(1902)
def test_checkpkg(self):
@@ -18,11 +23,6 @@ class Distrodata(OESelftestTestCase):
Product: oe-core
Author: Alexander Kanavin <alexander.kanavin@intel.com>
"""
- feature = 'INHERIT += "distrodata"\n'
- feature += 'LICENSE_FLAGS_WHITELIST += " commercial"\n'
-
- self.write_config(feature)
- bitbake('-c checkpkg world')
checkpkg_result = open(os.path.join(get_bb_var("LOG_DIR"), "checkpkg.csv")).readlines()[1:]
regressed_failures = [pkg_data[0] for pkg_data in [pkg_line.split('\t') for pkg_line in checkpkg_result] if pkg_data[11] == 'UNKNOWN_BROKEN']
regressed_successes = [pkg_data[0] for pkg_data in [pkg_line.split('\t') for pkg_line in checkpkg_result] if pkg_data[11] == 'KNOWN_BROKEN']
@@ -40,3 +40,60 @@ The following packages have been checked successfully for upstream versions,
but their recipes claim otherwise by setting UPSTREAM_VERSION_UNKNOWN. Please remove that line from the recipes.
""" + "\n".join(regressed_successes)
self.assertTrue(len(regressed_failures) == 0 and len(regressed_successes) == 0, msg)
+
+ def test_maintainers(self):
+ """
+ Summary: Test that oe-core recipes have a maintainer
+ Expected: All oe-core recipes (except a few special static/testing ones) should have a maintainer listed in maintainers.inc file.
+ Product: oe-core
+ Author: Alexander Kanavin <alexander.kanavin@intel.com>
+ """
+ def is_exception(pkg):
+ exceptions = ["packagegroup-", "initramfs-", "systemd-machine-units", "target-sdk-provides-dummy"]
+ for i in exceptions:
+ if i in pkg:
+ return True
+ return False
+
+ def is_in_oe_core(recipe, recipes):
+ self.assertTrue(recipe in recipes.keys(), "Recipe %s was not in 'bitbake-layers show-recipes' output" %(recipe))
+ self.assertTrue(len(recipes[recipe]) > 0, "'bitbake-layers show-recipes' could not determine what layer(s) a recipe %s is in" %(recipe))
+ try:
+ recipes[recipe].index('meta')
+ return True
+ except ValueError:
+ return False
+
+ def get_recipe_layers():
+ import re
+
+ recipes = {}
+ recipe_regex = re.compile('^(?P<name>.*):$')
+ layer_regex = re.compile('^ (?P<name>\S*) +')
+ output = runCmd('bitbake-layers show-recipes').output
+ for line in output.split('\n'):
+ recipe_name_obj = recipe_regex.search(line)
+ if recipe_name_obj:
+ recipe_name = recipe_name_obj.group('name')
+ recipes[recipe_name] = []
+ recipe_layer_obj = layer_regex.search(line)
+ if recipe_layer_obj:
+ layer_name = recipe_layer_obj.group('name')
+ recipes[recipe_name].append(layer_name)
+ return recipes
+
+ checkpkg_result = open(os.path.join(get_bb_var("LOG_DIR"), "checkpkg.csv")).readlines()[1:]
+ recipes_layers = get_recipe_layers()
+ no_maintainer_list = [pkg_data[0] for pkg_data in [pkg_line.split('\t') for pkg_line in checkpkg_result] \
+ if pkg_data[14] == '' and is_in_oe_core(pkg_data[0], recipes_layers) and not is_exception(pkg_data[0])]
+ msg = """
+The following packages do not have a maintainer assigned to them. Please add an entry to meta/conf/distro/include/maintainers.inc file.
+""" + "\n".join(no_maintainer_list)
+ self.assertTrue(len(no_maintainer_list) == 0, msg)
+
+ with_maintainer_list = [pkg_data[0] for pkg_data in [pkg_line.split('\t') for pkg_line in checkpkg_result] \
+ if pkg_data[14] != '' and is_in_oe_core(pkg_data[0], recipes_layers) and not is_exception(pkg_data[0])]
+ msg = """
+The list of oe-core packages with maintainers is empty. This may indicate that the test has regressed and needs fixing.
+"""
+ self.assertTrue(len(with_maintainer_list) > 0, msg)
--
2.15.1
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 07/10] man-db: replace the outdated man implementation
2018-02-12 11:05 ` [PATCH 07/10] man-db: replace the outdated man implementation Alexander Kanavin
@ 2018-02-21 20:07 ` Burton, Ross
2018-02-21 20:47 ` Burton, Ross
2018-02-21 20:22 ` Andre McCurdy
` (2 subsequent siblings)
3 siblings, 1 reply; 16+ messages in thread
From: Burton, Ross @ 2018-02-21 20:07 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 93295 bytes --]
Fails in multilib:
ERROR: lib32-man-db-2.8.1-r0 do_package_qa: QA Issue: non
-dev/-dbg/nativesdk- package contains symlink .so: lib32-man-db path
'/work/x86-pokymllib32-linux/lib32-man-db/2.8.1-r0/packages-split/lib32-man-db/usr/lib/man-db/libman.so'
non -dev/-dbg/nativesdk- package contains symlink .so: lib32-man-db path
'/work/x86-pokymllib32-linux/lib32-man-db/2.8.1-r0/packages-split/lib32-man-db/usr/lib/man-db/libmandb.so'
[dev-so]
Ross
On 12 February 2018 at 11:05, Alexander Kanavin <
alexander.kanavin@linux.intel.com> wrote:
> Until now oe-core has been using a well obsolete implementation of man.
>
> Man-db on the other hand is used by all modern Linux distros, is actively
> maintained, has a standard build system, and does not require 30 patches
> to build.
>
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
> meta/recipes-extended/man-db/man-db_2.8.1.bb | 41 ++++++
> meta/recipes-extended/man/man/configure_sed.patch | 32 -----
> .../man/man/man-1.5g-nonrootbuild.patch | 16 ---
> .../man/man/man-1.5h1-gencat.patch | 14 --
> meta/recipes-extended/man/man/man-1.5h1-make.patch | 17 ---
> .../man/man/man-1.5i2-initial.patch | 19 ---
> .../man/man/man-1.5i2-newline.patch | 15 --
> .../man/man/man-1.5i2-overflow.patch | 16 ---
> meta/recipes-extended/man/man/man-1.5j-i18n.patch | 16 ---
> .../man/man/man-1.5j-nocache.patch | 16 ---
> meta/recipes-extended/man/man/man-1.5j-utf8.patch | 61 --------
> .../man/man/man-1.5k-confpath.patch | 15 --
> .../man/man/man-1.5k-nonascii.patch | 18 ---
> meta/recipes-extended/man/man/man-1.5k-sofix.patch | 24 ----
> .../man/man/man-1.5m2-bug11621.patch | 15 --
> .../man/man/man-1.5m2-buildroot.patch | 52 -------
> .../man/man/man-1.5m2-no-color-for-printing.patch | 15 --
> .../man/man/man-1.5m2-sigpipe.patch | 30 ----
> .../man/man/man-1.6e-i18n_whatis.patch | 145
> -------------------
> .../man/man/man-1.6e-mandirs.patch | 31 ----
> .../man/man/man-1.6e-new_sections.patch | 15 --
> .../recipes-extended/man/man/man-1.6e-ro_usr.patch | 33 -----
> .../man/man/man-1.6e-security.patch | 62 --------
> .../man/man-1.6e-use_i18n_vars_in_a_std_way.patch | 160
> ---------------------
> .../man/man/man-1.6e-whatis2.patch | 59 --------
> .../man/man/man-1.6g-compile-warnings.patch | 105 --------------
> .../man/man/man-1.6g-configure.patch | 68 ---------
> .../man/man/man-1.6g-parallel.patch | 30 ----
> .../man/man/man-1.6g-whatis3.patch | 20 ---
> meta/recipes-extended/man/man/man.1.gz | Bin 12323 -> 0 bytes
> meta/recipes-extended/man/man/man.7.gz | Bin 6192 -> 0 bytes
> meta/recipes-extended/man/man/man.conf | 141
> ------------------
> meta/recipes-extended/man/man/manpath.5.gz | Bin 2133 -> 0 bytes
> meta/recipes-extended/man/man_1.6g.bb | 86 -----------
> 34 files changed, 41 insertions(+), 1346 deletions(-)
> create mode 100644 meta/recipes-extended/man-db/man-db_2.8.1.bb
> delete mode 100644 meta/recipes-extended/man/man/configure_sed.patch
> delete mode 100644 meta/recipes-extended/man/man/
> man-1.5g-nonrootbuild.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5h1-gencat.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5h1-make.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5i2-initial.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5i2-newline.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5i2-overflow.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5j-i18n.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5j-nocache.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5j-utf8.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5k-confpath.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5k-nonascii.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5k-sofix.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
> delete mode 100644 meta/recipes-extended/man/man/
> man-1.5m2-buildroot.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5m2-no-color-for-
> printing.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
> delete mode 100644 meta/recipes-extended/man/man/
> man-1.6e-i18n_whatis.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.6e-mandirs.patch
> delete mode 100644 meta/recipes-extended/man/man/
> man-1.6e-new_sections.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.6e-security.patch
> delete mode 100644 meta/recipes-extended/man/man/
> man-1.6e-use_i18n_vars_in_a_std_way.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.6e-whatis2.patch
> delete mode 100644 meta/recipes-extended/man/man/
> man-1.6g-compile-warnings.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.6g-configure.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.6g-parallel.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.6g-whatis3.patch
> delete mode 100644 meta/recipes-extended/man/man/man.1.gz
> delete mode 100644 meta/recipes-extended/man/man/man.7.gz
> delete mode 100644 meta/recipes-extended/man/man/man.conf
> delete mode 100644 meta/recipes-extended/man/man/manpath.5.gz
> delete mode 100644 meta/recipes-extended/man/man_1.6g.bb
>
> diff --git a/meta/recipes-extended/man-db/man-db_2.8.1.bb
> b/meta/recipes-extended/man-db/man-db_2.8.1.bb
> new file mode 100644
> index 00000000000..4e633acd09e
> --- /dev/null
> +++ b/meta/recipes-extended/man-db/man-db_2.8.1.bb
> @@ -0,0 +1,41 @@
> +SUMMARY = "An implementation of the standard Unix documentation system
> accessed using the man command"
> +HOMEPAGE = "http://man-db.nongnu.org/"
> +LICENSE = "LGPLv2.1 & GPLv2"
> +LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=
> a6f89e2100d9b6cdffcea4f398e37343 \
> + file://docs/COPYING;md5=
> eb723b61539feef013de476e68b5c50a"
> +
> +SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz"
> +SRC_URI[md5sum] = "51842978e06686286421f9498d1009b7"
> +SRC_URI[sha256sum] = "a6aec641ca3d9942b054cc0e9c3f05
> cb46a3a992bc0006795755e2fed1357f3e"
> +
> +DEPENDS = "libpipeline gdbm groff-native less"
> +
> +# | /usr/src/debug/man-db/2.8.0-r0/man-db-2.8.0/src/whatis.c:939:
> undefined reference to `_nl_msg_cat_cntr'
> +USE_NLS_libc-musl = "no"
> +
> +inherit gettext pkgconfig autotools
> +
> +EXTRA_OECONF = "--with-pager=less --disable-cache-owner"
> +
> +do_install_append_libc-musl() {
> + rm -f ${D}${libdir}/charset.alias
> +}
> +
> +FILES_${PN} += "${libdir}/tmpfiles.d"
> +
> +FILES_${PN}-dev += "${libdir}/${PN}/libman.so ${libdir}/${PN}/libmandb.so"
> +
> +RPROVIDES_${PN} += " man"
> +
> +def compress_pkg(d):
> + if "compress_doc" in (d.getVar("INHERIT") or "").split():
> + compress = d.getVar("DOC_COMPRESS")
> + if compress == "gz":
> + return "gzip"
> + elif compress == "bz2":
> + return "bzip2"
> + elif compress == "xz":
> + return "xz"
> + return ""
> +
> +RDEPENDS_${PN} += "${@compress_pkg(d)}"
> diff --git a/meta/recipes-extended/man/man/configure_sed.patch
> b/meta/recipes-extended/man/man/configure_sed.patch
> deleted file mode 100644
> index d49e6831d9a..00000000000
> --- a/meta/recipes-extended/man/man/configure_sed.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -man: replace ',' with '#'
> -
> -Sometimes, the parameters of CC/BUILD_CC contains the ',', which
> -cause the sed command failed, so replace the ',' with '#'
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
> -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
> ----
> - configure | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/configure b/configure
> -index 9f62cf9..9a565ae 100755
> ---- a/configure
> -+++ b/configure
> -@@ -1321,9 +1321,9 @@ do
> - echo "Creating $infile from $infile.in"
> - sed -e '
> - s,@version@,$version,
> --s,@CC@,$CC,
> -+s#@CC@#$CC#
> - s,@EXEEXT@,$EXEEXT,
> --s,@BUILD_CC@,$BUILD_CC,
> -+s#@BUILD_CC@#$BUILD_CC#
> - s,@INSTALL@,$INSTALL,
> - s,@DEFS@,$DEFS,
> - s,@LIBS@,$LIBS,
> ---
> -1.9.1
> -
> diff --git a/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
> b/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
> deleted file mode 100644
> index 6f834bd01bd..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> -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/man-1.5h1-gencat.patch
> b/meta/recipes-extended/man/man/man-1.5h1-gencat.patch
> deleted file mode 100644
> index 044b14c5099..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5h1-gencat.patch
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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 <stdio.h>
> - #include <stdlib.h>
> - #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
> deleted file mode 100644
> index 8631eb2c539..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5h1-make.patch
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.5i2-initial.patch
> b/meta/recipes-extended/man/man/man-1.5i2-initial.patch
> deleted file mode 100644
> index fe56c0706ca..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5i2-initial.patch
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.5i2-newline.patch
> b/meta/recipes-extended/man/man/man-1.5i2-newline.patch
> deleted file mode 100644
> index 611df5d2594..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5i2-newline.patch
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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)<BUFSIZE)
> - end++; /* note that buf is NUL-terminated */
> - *end = '\0';
> -
> diff --git a/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
> b/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
> deleted file mode 100644
> index 52d2881a893..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- man-1.5i2/src/man.c.overflow Mon Jun 25 00:01:45 2001
> -+++ man-1.5i2/src/man.c Mon Jun 25 00:01:45 2001
> -@@ -381,6 +381,9 @@
> - strcat(name, "/");
> - strcat(name, beg);
> - }
> -+ /* If this is too long, bad things have already happened. *
> -+ * we should quit IMMEDIATELY. */
> -+ if(strlen(name)>sizeof(ultname)) _exit(1);
> -
> - goto again;
> - }
> diff --git a/meta/recipes-extended/man/man/man-1.5j-i18n.patch
> b/meta/recipes-extended/man/man/man-1.5j-i18n.patch
> deleted file mode 100644
> index 2ae09c0ea49..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5j-i18n.patch
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.5j-nocache.patch
> b/meta/recipes-extended/man/man/man-1.5j-nocache.patch
> deleted file mode 100644
> index 751dddd53b5..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5j-nocache.patch
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.5j-utf8.patch
> b/meta/recipes-extended/man/man/man-1.5j-utf8.patch
> deleted file mode 100644
> index 33d3e4c9745..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5j-utf8.patch
> +++ /dev/null
> @@ -1,61 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.5k-confpath.patch
> b/meta/recipes-extended/man/man/man-1.5k-confpath.patch
> deleted file mode 100644
> index b5746c2df80..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5k-confpath.patch
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.5k-nonascii.patch
> b/meta/recipes-extended/man/man/man-1.5k-nonascii.patch
> deleted file mode 100644
> index d662d9b6a70..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5k-nonascii.patch
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- ./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/man-1.5k-sofix.patch
> b/meta/recipes-extended/man/man/man-1.5k-sofix.patch
> deleted file mode 100644
> index 50b925288ec..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5k-sofix.patch
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.5m2-bug11621.patch
> b/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
> deleted file mode 100644
> index 051299906b8..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- ./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/man-1.5m2-buildroot.patch
> b/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
> deleted file mode 100644
> index bc97f56b9af..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
> +++ /dev/null
> @@ -1,52 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- ./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/man-1.5m2-no-color-for-printing.patch
> b/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
> deleted file mode 100644
> index c85ff1d8c72..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.5m2-sigpipe.patch
> b/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
> deleted file mode 100644
> index 8af78eab7b1..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.6e-i18n_whatis.patch
> b/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
> deleted file mode 100644
> index e321325d63f..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
> +++ /dev/null
> @@ -1,145 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> -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/man-1.6e-mandirs.patch
> b/meta/recipes-extended/man/man/man-1.6e-mandirs.patch
> deleted file mode 100644
> index b240064c980..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6e-mandirs.patch
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.6e-new_sections.patch
> b/meta/recipes-extended/man/man/man-1.6e-new_sections.patch
> deleted file mode 100644
> index fb9773c646e..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6e-new_sections.patch
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.6e-ro_usr.patch
> b/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
> deleted file mode 100644
> index 1d1cb0c724c..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> -Index: man-1.6f/src/makewhatis.sh
> -===================================================================
> ---- man-1.6f.orig/src/makewhatis.sh 2010-12-29 13:42:34.000000000
> -0800
> -+++ man-1.6f/src/makewhatis.sh 2010-12-29 13:42:35.667428347 -0800
> -@@ -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
> diff --git a/meta/recipes-extended/man/man/man-1.6e-security.patch
> b/meta/recipes-extended/man/man/man-1.6e-security.patch
> deleted file mode 100644
> index 312a882f063..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6e-security.patch
> +++ /dev/null
> @@ -1,62 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> -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/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
> deleted file mode 100644
> index 568f742100c..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_
> a_std_way.patch
> +++ /dev/null
> @@ -1,160 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> -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
> <string.h> */
> - 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/man-1.6e-whatis2.patch
> b/meta/recipes-extended/man/man/man-1.6e-whatis2.patch
> deleted file mode 100644
> index fc4ed3135dd..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6e-whatis2.patch
> +++ /dev/null
> @@ -1,59 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> -Index: man-1.6f/src/makewhatis.sh
> -===================================================================
> ---- man-1.6f.orig/src/makewhatis.sh 2010-12-29 13:51:45.000000000
> -0800
> -+++ man-1.6f/src/makewhatis.sh 2010-12-29 13:59:35.399799412 -0800
> -@@ -164,10 +164,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
> -@@ -180,13 +185,7 @@
> - echo "about to enter $mandir" > /dev/stderr
> - fi
> -
> -- # kludge for Slackware's /usr/man/preformat
> -- if [ $mandir = /usr/man/preformat ]
> -- then
> -- mandir1=/usr/man
> -- else
> -- mandir1=$mandir
> -- fi
> -+ mandir1=$WHATIS_DIR
> -
> - # if $mandir is on a readonly partition, and the whatis file
> - # is not a symlink, then let's skip trying to update it
> -@@ -207,11 +206,6 @@
> - fi
> - 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
> -@@ -447,7 +447,6 @@
> -
> - chmod 644 ${mandir1}/whatis
> - rm $TMPFILE
> -- fi
> - done
> - done
> diff --git a/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch
> b/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch
> deleted file mode 100644
> index 4631d2d0635..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch
> +++ /dev/null
> @@ -1,105 +0,0 @@
> -Fix a build error when building man.config.5 (a remnant of a long
> -ago previous patch). Optimized the manpages Makefile for parallel
> -builds. Also, fix compile warnings in a couple other files.
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Bill Randle <william.c.randle@intel.com>
> -
> ---- man-1.6g/man/Makefile.in.orig 2016-03-28 17:31:08.723949180 -0700
> -+++ man-1.6g/man/Makefile.in 2016-03-28 17:46:12.866910386 -0700
> -@@ -5,6 +5,13 @@
> - ALL = man.1 whatis.1 apropos.1 man.config.5
> - MAYBE8 = makewhatis
> -
> -+SUBDIRS := $(shell echo @languages@)
> -+
> -+.PHONY: subdirs $(SUBDIRS)
> -+
> -+man.config.man: man.conf.man
> -+ @cp $< $@
> -+
> - .SUFFIXES: .man .1 .5 .8
> -
> - .man.1:
> -@@ -19,11 +26,11 @@
> - INSTALL = @INSTALL@ -c -m 644
> -
> - # Where to put the manual pages.
> --mandir = $(DESTDIR)$(PREFIX)@mandir@$(SLANG)
> -+mandir := $(DESTDIR)$(PREFIX)@mandir@$(SLANG)
> -
> - all: $(ALL)
> - for i in $(MAYBE8); \
> -- do if test -f $$i.man; then make -f ../Makefile $$i.8; fi;
> done
> -+ do if test -f $$i.man; then $(MAKE) -f ../Makefile $$i.8;
> fi; done
> -
> - install: $(ALL)
> - mkdir -p $(mandir)/man1 $(mandir)/man5 $(mandir)/man8
> -@@ -38,24 +45,27 @@
> - rm -f core *.in *.@man1ext@ *.@man5ext@ *.@man8ext@ *~
> -
> - spotless:
> -+ rm -f man.config.man
> -
> - subdirs:
> -- @for i in @languages@; do if test -d $$i; then echo; \
> -- echo "==== Making the `cat $$i.txt` man pages. ===="; \
> -- cd $$i; make -f ../Makefile; cd ..; \
> -- else echo "==== No $$i man pages found. ===="; fi; done
> -+subdirs: $(SUBDIRS)
> -+$(SUBDIRS):
> -+ if test -d $@; then echo; \
> -+ echo "==== Making the `cat $@.txt` man pages. ===="; \
> -+ $(MAKE) -C $@ -f ../Makefile all; \
> -+ else echo "==== No $@ man pages found. ===="; fi
> -
> - installsubdirs:
> - @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; cd ..; \
> - else echo "==== No $$i man pages found. ===="; fi; done
> -
> - cleansubdirs:
> -- @for i in ??; do cd $$i; make -f ../Makefile clean; cd ..; done
> -+ @for i in ??; do $(MAKE) -C $$i -f ../Makefile clean; done
> - rm -f core *~
> -
> - spotlesssubdirs:
> -- for i in ??; do cd $$i; make -f ../Makefile spotless; cd ..; done
> -+ for i in ??; do $(MAKE) -C $$i -f ../Makefile spotless; done
> - rm -f Makefile
> -
> ---- man-1.6g/src/gripes.c.orig 2006-11-21 11:53:44.000000000 -0800
> -+++ man-1.6g/src/gripes.c 2016-03-30 16:32:31.601103487 -0700
> -@@ -7,8 +7,6 @@
> -
> - extern char *msg[];
> -
> --static char *mantexts = "man"; /* e.g. /usr/lib/locale/%L/
> man.cat */
> --
> - #ifdef NONLS
> -
> - static char *
> -@@ -30,6 +28,8 @@
> - #include <nl_types.h>
> - #include "../catopen/catopen.c"
> -
> -+static char *mantexts = "man"; /* e.g. /usr/lib/locale/%L/
> man.cat */
> -+
> - nl_catd catfd = (nl_catd) -1;
> - int cat_is_open = 0;
> -
> ---- man-1.6g/src/manfile.c.orig 2005-08-20 16:26:06.000000000 -0700
> -+++ man-1.6g/src/manfile.c 2016-03-29 09:10:21.527841285 -0700
> -@@ -299,7 +299,7 @@
> - const char *((*tocat)(const char *man_filename, const char *ext,
> - int flags))) {
> - char **sl;
> -- struct manpage *res;
> -+ struct manpage *res = 0;
> -
> - standards = (flags & (FHS | FSSTND | DO_HP | DO_IRIX));
> - to_cat_filename = tocat;
> diff --git a/meta/recipes-extended/man/man/man-1.6g-configure.patch
> b/meta/recipes-extended/man/man/man-1.6g-configure.patch
> deleted file mode 100644
> index 106cc987819..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6g-configure.patch
> +++ /dev/null
> @@ -1,68 +0,0 @@
> -Use BUILD_CC and target include files for configuration tests.
> -If cross-compiling, force pathnames for helper programs, since
> -autodiscovery by the configure script will not work.
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Bill Randle <william.c.randle at intel.com>
> -
> ---- man-1.6g/configure.orig 2016-03-28 17:46:12.734910976 -0700
> -+++ man-1.6g/configure 2016-03-30 21:47:45.110572908 -0700
> -@@ -216,7 +216,8 @@
> - INCLUDEDIR=${INCLUDEDIR-/usr/include}
> -
> - rm -f conftest conftest.c
> --compile="$CC $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1"
> -+# since we are interested in target feature support, use that sysroot
> -+compile="$BUILD_CC -isystem/${PKG_CONFIG_SYSROOT_DIR}/usr/include $DEFS
> conftest.c -o conftest $LIBS >/dev/null 2>&1"
> -
> - # Check for various header files.
> -
> -@@ -455,19 +456,23 @@
> - fi
> - 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
> -- 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
> -+ if [ $BUILD_CC != $CC ]; then
> -+ # cross compiling => target fs not available, so force defaults
> -+ Fgroff=/usr/bin/groff
> -+ Fnroff=/usr/bin/nroff
> -+ Fjnroff=/usr/bin/nroff
> -+ Fgeqn=/usr/bin/eqn
> -+ Fgneqn=/usr/bin/neqn
> -+ Fgtbl=/usr/bin/tbl
> -+ Fcol=/usr/bin/col
> -+ Fgrefer=/usr/bin/refer
> -+ Fgpic=/usr/bin/pic
> -+ Fmore=/bin/more
> -+ Fless=/usr/bin/less
> -+ Fcmp=/usr/bin/cmp
> -+ Fcat=/bin/cat
> -+ Fgawk=/usr/bin/gawk
> -+ fi
> -
> -
> - for i in eqn tbl refer pic
> -@@ -507,8 +512,8 @@
> - jnroff="$Fjnroff -Tutf8 -mandocj"
> - fi
> - eqn="$Fgeqn -Tps"
> -- neqn="$Fgeqn -Tutf8"
> -- jneqn="$Fgeqn -Tutf8"
> -+ neqn="$Fgneqn -Tutf8"
> -+ jneqn="$Fgneqn -Tutf8"
> - tbl="$Fgtbl"
> - col="$Fcol"
> - vgrind="$Fvgrind"
> diff --git a/meta/recipes-extended/man/man/man-1.6g-parallel.patch
> b/meta/recipes-extended/man/man/man-1.6g-parallel.patch
> deleted file mode 100644
> index 72a88b898a1..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6g-parallel.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -The Makefile for man has a rule to create two generated targets with
> -a program run from the shell. Because the rule was run twice, with
> -parallel make, the generated files were being overwritten at the same
> -time they were being compiled. This patch forces the rule to be run
> -only once.
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Bill Randle <william.c.randle at intel.com>
> -
> ---- man-1.6g/src/Makefile.in.orig 2010-12-31 12:28:46.000000000 -0800
> -+++ man-1.6g/src/Makefile.in 2016-03-28 09:09:16.845458798 -0700
> -@@ -43,8 +43,10 @@
> - makemsg:
> - $(BUILD_CC) -o makemsg makemsg.c
> -
> --msg.c gripedefs.h: ../msgs/mess.en makemsg
> -+msg.c gripedefs.h: genfiles-stamp
> -+genfiles-stamp: ../msgs/mess.en makemsg
> - ./makemsg ../msgs/mess.en gripedefs.h msg.c
> -+ touch genfiles-stamp
> -
> - # glob.c does not have prototypes
> - glob.o: glob.c ndir.h
> -@@ -117,4 +119,4 @@
> -
> - spotless: clean
> - rm -f Makefile config.status paths.h version.h man.conf
> -- rm -f gripedefs.h msg.c mess.*.cat
> -+ rm -f gripedefs.h msg.c mess.*.cat genfiles-stamp
> diff --git a/meta/recipes-extended/man/man/man-1.6g-whatis3.patch
> b/meta/recipes-extended/man/man/man-1.6g-whatis3.patch
> deleted file mode 100644
> index 63344568575..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6g-whatis3.patch
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -Do not use absolute path for awk while getting the path of awk
> -when running makewhatis.
> -This can avoid errors if path of awk changes.
> -
> -Upstream-Status: Submitted [man-1.6g]
> -
> -Signed-off-by: Jian Liu <jian.liu@windriver.com>
> -
> -diff -Nur man-1.6g.orig/src/makewhatis.sh man-1.6g/src/makewhatis.sh
> ---- man-1.6g.orig/src/makewhatis.sh 2015-02-25 16:13:12.657611419
> +0800
> -+++ man-1.6g/src/makewhatis.sh 2015-02-25 16:14:49.334694815 +0800
> -@@ -67,7 +67,7 @@
> - # but that leads to problems and bugs.
> -
> - # AWK=/usr/bin/gawk
> --AWK=@awk@
> -+AWK=`which awk`
> -
> - # Find a place for our temporary files. If security is not a concern, use
> - # TMPFILE=/tmp/whatis$$; TMPFILEDIR=none
> diff --git a/meta/recipes-extended/man/man/man.1.gz
> b/meta/recipes-extended/man/man/man.1.gz
> deleted file mode 100644
> index c368045153406ab730aad35bfc7ffd91238bd47d..
> 0000000000000000000000000000000000000000
> GIT binary patch
> literal 0
> HcmV?d00001
>
> literal 12323
> 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
> J#~S#D004`l-XQ=0
>
> diff --git a/meta/recipes-extended/man/man/man.7.gz
> b/meta/recipes-extended/man/man/man.7.gz
> deleted file mode 100644
> index e85af82426507521badb6f5c425896385f469b5a..
> 0000000000000000000000000000000000000000
> GIT binary patch
> literal 0
> HcmV?d00001
>
> literal 6192
> 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
> OO8yVmcsMtKI{*OKZ6#>{
>
> diff --git a/meta/recipes-extended/man/man/man.conf
> b/meta/recipes-extended/man/man/man.conf
> deleted file mode 100644
> index fc10be2758d..00000000000
> --- a/meta/recipes-extended/man/man/man.conf
> +++ /dev/null
> @@ -1,141 +0,0 @@
> -#
> -# Generated automatically from man.conf.in by the
> -# configure script.
> -#
> -# man.conf from man-1.5p
> -#
> -# For more information about this file, see the man pages man(1)
> -# and man.conf(5).
> -#
> -# This file is read by man to configure the default manpath (also used
> -# when MANPATH contains an empty substring), to find out where the cat
> -# pages corresponding to given man pages should be stored,
> -# and to map each PATH element to a manpath element.
> -# It may also record the pathname of the man binary. [This is unused.]
> -# The format is:
> -#
> -# MANBIN pathname
> -# MANPATH manpath_element [corresponding_catdir]
> -# MANPATH_MAP path_element manpath_element
> -#
> -# If no catdir is given, it is assumed to be equal to the mandir
> -# (so that this dir has both man1 etc. and cat1 etc. subdirs).
> -# This is the traditional Unix setup.
> -# Certain versions of the FSSTND recommend putting formatted versions
> -# of /usr/.../man/manx/page.x into /var/catman/.../catx/page.x.
> -# The keyword FSSTND will cause this behaviour.
> -# Certain versions of the FHS recommend putting formatted versions of
> -# /usr/.../share/man/[locale/]manx/page.x into
> -# /var/cache/man/.../[locale/]catx/page.x.
> -# The keyword FHS will cause this behaviour (and overrides FSSTND).
> -# Explicitly given catdirs override.
> -#
> -# FSSTND
> -FHS
> -#
> -# This file is also read by man in order to find how to call nroff, less,
> etc.,
> -# and to determine the correspondence between extensions and
> decompressors.
> -#
> -# MANBIN /usr/local/bin/man
> -#
> -# Every automatically generated MANPATH includes these fields
> -#
> -MANPATH /usr/man
> -MANPATH /usr/share/man
> -MANPATH /usr/local/man
> -MANPATH /usr/local/share/man
> -MANPATH /usr/X11R6/man
> -#
> -# Uncomment if you want to include one of these by default
> -#
> -# MANPATH /opt/*/man
> -# MANPATH /usr/lib/*/man
> -# MANPATH /usr/share/*/man
> -# MANPATH /usr/kerberos/man
> -#
> -# Set up PATH to MANPATH mapping
> -#
> -# If people ask for "man foo" and have "/dir/bin/foo" in their PATH
> -# and the docs are found in "/dir/man", then no mapping is required.
> -#
> -# The below mappings are superfluous when the right hand side is
> -# in the mandatory manpath already, but will keep man from statting
> -# lots of other nearby files and directories.
> -#
> -MANPATH_MAP /bin /usr/share/man
> -MANPATH_MAP /sbin /usr/share/man
> -MANPATH_MAP /usr/bin /usr/share/man
> -MANPATH_MAP /usr/sbin /usr/share/man
> -MANPATH_MAP /usr/local/bin /usr/local/share/man
> -MANPATH_MAP /usr/local/sbin /usr/local/share/man
> -MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man
> -MANPATH_MAP /usr/bin/X11 /usr/X11R6/man
> -MANPATH_MAP /usr/bin/mh /usr/share/man
> -#
> -# NOAUTOPATH keeps man from automatically adding directories that look
> like
> -# manual page directories to the path.
> -#
> -#NOAUTOPATH
> -#
> -# NOCACHE keeps man from creating cache pages ("cat pages")
> -# (generally one enables/disable cat page creation by creating/deleting
> -# the directory they would live in - man never does mkdir)
> -#
> -#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.
> -# For use with utf-8, NROFF should be "nroff -mandoc" without -T option.
> -# (Maybe - but today I need -Tlatin1 to prevent double conversion to
> utf8.)
> -#
> -# If you have a new troff (version 1.18.1?) and its colored output
> -# causes problems, add the -c option to TROFF, NROFF, JNROFF.
> -#
> -TROFF /usr/bin/groff -Tps -mandoc
> -NROFF /usr/bin/nroff -Tlatin1 -mandoc
> -JNROFF /usr/bin/groff -Tnippon -mandocj
> -EQN /usr/bin/eqn -Tps
> -NEQN /usr/bin/eqn -Tlatin1
> -JNEQN /usr/bin/eqn -Tnippon
> -TBL /usr/bin/tbl
> -# COL /usr/bin/col
> -REFER /usr/bin/refer
> -PIC /usr/bin/pic
> -VGRIND
> -GRAP
> -PAGER /usr/bin/less -isR
> -CAT /bin/cat
> -#
> -# The command "man -a xyzzy" will show all man pages for xyzzy.
> -# When CMP is defined man will try to avoid showing the same
> -# text twice. (But compressed pages compare unequal.)
> -#
> -CMP /usr/bin/cmp -s
> -#
> -# Compress cat pages
> -#
> -COMPRESS /bin/bzip2
> -COMPRESS_EXT .bz2
> -#
> -# Default manual sections (and order) to search if -S is not specified
> -# and the MANSECT environment variable is not set.
> -#
> -MANSECT 1:1p:8:2:3:3p:4:5:6:7:9:0p:tcl:n:l:p:o
> -#
> -# Default options to use when man is invoked without options
> -# This is mainly for the benefit of those that think -a should be the
> default
> -# Note that some systems have /usr/man/allman, causing pages to be shown
> twice.
> -#
> -#MANDEFOPTIONS -a
> -#
> -# Decompress with given decompressor when input file has given extension
> -# The command given must act as a filter.
> -#
> -.gz /bin/gunzip -c
> -.bz2 /usr/bin/bunzip2 -c
> -.xz /usr/bin/unxz -c
> -.z
> -.Z /bin/zcat
> -.F
> -.Y
> diff --git a/meta/recipes-extended/man/man/manpath.5.gz
> b/meta/recipes-extended/man/man/manpath.5.gz
> deleted file mode 100644
> index c012ff89763bb057afaaaed3b616244748354fec..
> 0000000000000000000000000000000000000000
> GIT binary patch
> literal 0
> HcmV?d00001
>
> literal 2133
> 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
> L!Vpl2a}xjn5ok8&
>
> diff --git a/meta/recipes-extended/man/man_1.6g.bb
> b/meta/recipes-extended/man/man_1.6g.bb
> deleted file mode 100644
> index ff603f842c1..00000000000
> --- a/meta/recipes-extended/man/man_1.6g.bb
> +++ /dev/null
> @@ -1,86 +0,0 @@
> -SUMMARY = "Online documentation tools"
> -DESCRIPTION = "A set of documentation tools: man, apropos and whatis"
> -SECTION = "console/utils"
> -HOMEPAGE = "http://primates.ximian.com/~flucifredi/man"
> -LICENSE = "GPLv2"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
> -
> -PR = "r1"
> -
> -DEPENDS = "groff less"
> -
> -def compress_pkg(d):
> - if "compress_doc" in (d.getVar("INHERIT") or "").split():
> - compress = d.getVar("DOC_COMPRESS")
> - if compress == "gz":
> - return "gzip"
> - elif compress == "bz2":
> - return "bzip2"
> - elif compress == "xz":
> - return "xz"
> - return ""
> -
> -RDEPENDS_${PN} += "${@compress_pkg(d)}"
> -
> -SRC_URI = "http://pkgs.fedoraproject.org/lookaside/pkgs/man2html/${
> BP}.tar.gz/ba154d5796928b841c9c69f0ae376660/${BP}.tar.gz \
> - file://man-1.5k-confpath.patch;striplevel=0 \
> - file://man-1.5h1-make.patch \
> - file://man-1.5k-nonascii.patch \
> - file://man-1.6e-security.patch \
> - file://man-1.6e-mandirs.patch \
> - file://man-1.5m2-bug11621.patch \
> - file://man-1.5k-sofix.patch \
> - file://man-1.5m2-buildroot.patch \
> - file://man-1.6e-ro_usr.patch \
> - file://man-1.5i2-newline.patch;striplevel=0 \
> - file://man-1.5j-utf8.patch \
> - file://man-1.5i2-overflow.patch \
> - file://man-1.5j-nocache.patch \
> - file://man-1.5i2-initial.patch \
> - file://man-1.5h1-gencat.patch;striplevel=0 \
> - file://man-1.5g-nonrootbuild.patch \
> - file://man-1.5j-i18n.patch \
> - file://man-1.6e-whatis2.patch \
> - file://man-1.6e-use_i18n_vars_in_a_std_way.patch \
> - file://man-1.5m2-no-color-for-printing.patch \
> - file://man-1.5m2-sigpipe.patch \
> - file://man-1.6e-i18n_whatis.patch \
> - file://man-1.6e-new_sections.patch \
> - file://man.1.gz;unpack=false \
> - file://man.7.gz;unpack=false \
> - file://man.conf \
> - file://manpath.5.gz;unpack=false \
> - file://man-1.6g-whatis3.patch \
> - file://configure_sed.patch \
> - file://man-1.6g-parallel.patch \
> - file://man-1.6g-compile-warnings.patch \
> - file://man-1.6g-configure.patch \
> -"
> -
> -SRC_URI[md5sum] = "ba154d5796928b841c9c69f0ae376660"
> -SRC_URI[sha256sum] = "ccdcb8c3f4e0080923d7e818f0e4a2
> 02db26c46415eaef361387c20995b8959f"
> -
> -CFLAGS += "-DSYSV"
> -
> -do_configure () {
> - ${S}/configure -default -confdir /etc +sgid +fhs +lang all
> -}
> -
> -
> -do_install() {
> - oe_runmake install DESTDIR=${D}
> -}
> -
> -do_install_append(){
> - mkdir -p ${D}${sysconfdir}
> - mkdir -p ${D}${datadir}/man/man5
> - mkdir -p ${D}${datadir}/man/man7
> - cp ${WORKDIR}/man.conf ${D}${sysconfdir}/man.config
> - 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/
> -}
> -
> -
> -RDEPENDS_${PN} = "less groff"
> -FILES_${PN} += "${datadir}/locale ${sysconfdir}/man.config"
> --
> 2.15.1
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
[-- Attachment #2: Type: text/html, Size: 115104 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 07/10] man-db: replace the outdated man implementation
2018-02-12 11:05 ` [PATCH 07/10] man-db: replace the outdated man implementation Alexander Kanavin
2018-02-21 20:07 ` Burton, Ross
@ 2018-02-21 20:22 ` Andre McCurdy
2018-02-21 20:43 ` Mark Hatle
2018-02-22 12:49 ` Burton, Ross
3 siblings, 0 replies; 16+ messages in thread
From: Andre McCurdy @ 2018-02-21 20:22 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: OE Core mailing list
On Mon, Feb 12, 2018 at 3:05 AM, Alexander Kanavin
<alexander.kanavin@linux.intel.com> wrote:
> Until now oe-core has been using a well obsolete implementation of man.
>
> Man-db on the other hand is used by all modern Linux distros, is actively
> maintained, has a standard build system, and does not require 30 patches
> to build.
>
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
>
> diff --git a/meta/recipes-extended/man-db/man-db_2.8.1.bb b/meta/recipes-extended/man-db/man-db_2.8.1.bb
> new file mode 100644
> index 00000000000..4e633acd09e
> --- /dev/null
> +++ b/meta/recipes-extended/man-db/man-db_2.8.1.bb
> @@ -0,0 +1,41 @@
> +SUMMARY = "An implementation of the standard Unix documentation system accessed using the man command"
> +HOMEPAGE = "http://man-db.nongnu.org/"
> +LICENSE = "LGPLv2.1 & GPLv2"
> +LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
> + file://docs/COPYING;md5=eb723b61539feef013de476e68b5c50a"
> +
> +SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz"
> +SRC_URI[md5sum] = "51842978e06686286421f9498d1009b7"
> +SRC_URI[sha256sum] = "a6aec641ca3d9942b054cc0e9c3f05cb46a3a992bc0006795755e2fed1357f3e"
> +
> +DEPENDS = "libpipeline gdbm groff-native less"
less should be a runtime dependency, not build time.
> +# | /usr/src/debug/man-db/2.8.0-r0/man-db-2.8.0/src/whatis.c:939: undefined reference to `_nl_msg_cat_cntr'
> +USE_NLS_libc-musl = "no"
> +
> +inherit gettext pkgconfig autotools
> +
> +EXTRA_OECONF = "--with-pager=less --disable-cache-owner"
> +
> +do_install_append_libc-musl() {
> + rm -f ${D}${libdir}/charset.alias
> +}
> +
> +FILES_${PN} += "${libdir}/tmpfiles.d"
> +
> +FILES_${PN}-dev += "${libdir}/${PN}/libman.so ${libdir}/${PN}/libmandb.so"
> +
> +RPROVIDES_${PN} += " man"
> +
> +def compress_pkg(d):
> + if "compress_doc" in (d.getVar("INHERIT") or "").split():
> + compress = d.getVar("DOC_COMPRESS")
> + if compress == "gz":
> + return "gzip"
> + elif compress == "bz2":
> + return "bzip2"
> + elif compress == "xz":
> + return "xz"
> + return ""
> +
> +RDEPENDS_${PN} += "${@compress_pkg(d)}"
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 07/10] man-db: replace the outdated man implementation
2018-02-12 11:05 ` [PATCH 07/10] man-db: replace the outdated man implementation Alexander Kanavin
2018-02-21 20:07 ` Burton, Ross
2018-02-21 20:22 ` Andre McCurdy
@ 2018-02-21 20:43 ` Mark Hatle
2018-02-22 12:49 ` Burton, Ross
3 siblings, 0 replies; 16+ messages in thread
From: Mark Hatle @ 2018-02-21 20:43 UTC (permalink / raw)
To: openembedded-core
On 2/12/18 5:05 AM, Alexander Kanavin wrote:
> Until now oe-core has been using a well obsolete implementation of man.
>
> Man-db on the other hand is used by all modern Linux distros, is actively
> maintained, has a standard build system, and does not require 30 patches
> to build.
The reason why man was being used and not man-db was due to space savings for
small systems.
There were small systems that did want to use man pages. 'man' always rendered
the pages live, but never stored a cache of already rendered content.
'man-db' on the other hand wants to cache anything it's rendered. This is great
for a multi-user system, but not necessarily an embedded system.
I don't have any objections to man-db, but I want people to understand why 'man'
was chosen (and still maintained) over man-db.
(This does also mean that you need to test man-db works properly on a read-only
system.)
--Mark
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> ---
> meta/recipes-extended/man-db/man-db_2.8.1.bb | 41 ++++++
> meta/recipes-extended/man/man/configure_sed.patch | 32 -----
> .../man/man/man-1.5g-nonrootbuild.patch | 16 ---
> .../man/man/man-1.5h1-gencat.patch | 14 --
> meta/recipes-extended/man/man/man-1.5h1-make.patch | 17 ---
> .../man/man/man-1.5i2-initial.patch | 19 ---
> .../man/man/man-1.5i2-newline.patch | 15 --
> .../man/man/man-1.5i2-overflow.patch | 16 ---
> meta/recipes-extended/man/man/man-1.5j-i18n.patch | 16 ---
> .../man/man/man-1.5j-nocache.patch | 16 ---
> meta/recipes-extended/man/man/man-1.5j-utf8.patch | 61 --------
> .../man/man/man-1.5k-confpath.patch | 15 --
> .../man/man/man-1.5k-nonascii.patch | 18 ---
> meta/recipes-extended/man/man/man-1.5k-sofix.patch | 24 ----
> .../man/man/man-1.5m2-bug11621.patch | 15 --
> .../man/man/man-1.5m2-buildroot.patch | 52 -------
> .../man/man/man-1.5m2-no-color-for-printing.patch | 15 --
> .../man/man/man-1.5m2-sigpipe.patch | 30 ----
> .../man/man/man-1.6e-i18n_whatis.patch | 145 -------------------
> .../man/man/man-1.6e-mandirs.patch | 31 ----
> .../man/man/man-1.6e-new_sections.patch | 15 --
> .../recipes-extended/man/man/man-1.6e-ro_usr.patch | 33 -----
> .../man/man/man-1.6e-security.patch | 62 --------
> .../man/man-1.6e-use_i18n_vars_in_a_std_way.patch | 160 ---------------------
> .../man/man/man-1.6e-whatis2.patch | 59 --------
> .../man/man/man-1.6g-compile-warnings.patch | 105 --------------
> .../man/man/man-1.6g-configure.patch | 68 ---------
> .../man/man/man-1.6g-parallel.patch | 30 ----
> .../man/man/man-1.6g-whatis3.patch | 20 ---
> meta/recipes-extended/man/man/man.1.gz | Bin 12323 -> 0 bytes
> meta/recipes-extended/man/man/man.7.gz | Bin 6192 -> 0 bytes
> meta/recipes-extended/man/man/man.conf | 141 ------------------
> meta/recipes-extended/man/man/manpath.5.gz | Bin 2133 -> 0 bytes
> meta/recipes-extended/man/man_1.6g.bb | 86 -----------
> 34 files changed, 41 insertions(+), 1346 deletions(-)
> create mode 100644 meta/recipes-extended/man-db/man-db_2.8.1.bb
> delete mode 100644 meta/recipes-extended/man/man/configure_sed.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5h1-gencat.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5h1-make.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5i2-initial.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5i2-newline.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5i2-overflow.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5j-i18n.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5j-nocache.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5j-utf8.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5k-confpath.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5k-nonascii.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5k-sofix.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.6e-mandirs.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.6e-new_sections.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.6e-security.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.6e-whatis2.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.6g-configure.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.6g-parallel.patch
> delete mode 100644 meta/recipes-extended/man/man/man-1.6g-whatis3.patch
> delete mode 100644 meta/recipes-extended/man/man/man.1.gz
> delete mode 100644 meta/recipes-extended/man/man/man.7.gz
> delete mode 100644 meta/recipes-extended/man/man/man.conf
> delete mode 100644 meta/recipes-extended/man/man/manpath.5.gz
> delete mode 100644 meta/recipes-extended/man/man_1.6g.bb
>
> diff --git a/meta/recipes-extended/man-db/man-db_2.8.1.bb b/meta/recipes-extended/man-db/man-db_2.8.1.bb
> new file mode 100644
> index 00000000000..4e633acd09e
> --- /dev/null
> +++ b/meta/recipes-extended/man-db/man-db_2.8.1.bb
> @@ -0,0 +1,41 @@
> +SUMMARY = "An implementation of the standard Unix documentation system accessed using the man command"
> +HOMEPAGE = "http://man-db.nongnu.org/"
> +LICENSE = "LGPLv2.1 & GPLv2"
> +LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
> + file://docs/COPYING;md5=eb723b61539feef013de476e68b5c50a"
> +
> +SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz"
> +SRC_URI[md5sum] = "51842978e06686286421f9498d1009b7"
> +SRC_URI[sha256sum] = "a6aec641ca3d9942b054cc0e9c3f05cb46a3a992bc0006795755e2fed1357f3e"
> +
> +DEPENDS = "libpipeline gdbm groff-native less"
> +
> +# | /usr/src/debug/man-db/2.8.0-r0/man-db-2.8.0/src/whatis.c:939: undefined reference to `_nl_msg_cat_cntr'
> +USE_NLS_libc-musl = "no"
> +
> +inherit gettext pkgconfig autotools
> +
> +EXTRA_OECONF = "--with-pager=less --disable-cache-owner"
> +
> +do_install_append_libc-musl() {
> + rm -f ${D}${libdir}/charset.alias
> +}
> +
> +FILES_${PN} += "${libdir}/tmpfiles.d"
> +
> +FILES_${PN}-dev += "${libdir}/${PN}/libman.so ${libdir}/${PN}/libmandb.so"
> +
> +RPROVIDES_${PN} += " man"
> +
> +def compress_pkg(d):
> + if "compress_doc" in (d.getVar("INHERIT") or "").split():
> + compress = d.getVar("DOC_COMPRESS")
> + if compress == "gz":
> + return "gzip"
> + elif compress == "bz2":
> + return "bzip2"
> + elif compress == "xz":
> + return "xz"
> + return ""
> +
> +RDEPENDS_${PN} += "${@compress_pkg(d)}"
> diff --git a/meta/recipes-extended/man/man/configure_sed.patch b/meta/recipes-extended/man/man/configure_sed.patch
> deleted file mode 100644
> index d49e6831d9a..00000000000
> --- a/meta/recipes-extended/man/man/configure_sed.patch
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -man: replace ',' with '#'
> -
> -Sometimes, the parameters of CC/BUILD_CC contains the ',', which
> -cause the sed command failed, so replace the ',' with '#'
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
> -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
> ----
> - configure | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/configure b/configure
> -index 9f62cf9..9a565ae 100755
> ---- a/configure
> -+++ b/configure
> -@@ -1321,9 +1321,9 @@ do
> - echo "Creating $infile from $infile.in"
> - sed -e '
> - s,@version@,$version,
> --s,@CC@,$CC,
> -+s#@CC@#$CC#
> - s,@EXEEXT@,$EXEEXT,
> --s,@BUILD_CC@,$BUILD_CC,
> -+s#@BUILD_CC@#$BUILD_CC#
> - s,@INSTALL@,$INSTALL,
> - s,@DEFS@,$DEFS,
> - s,@LIBS@,$LIBS,
> ---
> -1.9.1
> -
> diff --git a/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch b/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
> deleted file mode 100644
> index 6f834bd01bd..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> -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/man-1.5h1-gencat.patch b/meta/recipes-extended/man/man/man-1.5h1-gencat.patch
> deleted file mode 100644
> index 044b14c5099..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5h1-gencat.patch
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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 <stdio.h>
> - #include <stdlib.h>
> - #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
> deleted file mode 100644
> index 8631eb2c539..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5h1-make.patch
> +++ /dev/null
> @@ -1,17 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.5i2-initial.patch b/meta/recipes-extended/man/man/man-1.5i2-initial.patch
> deleted file mode 100644
> index fe56c0706ca..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5i2-initial.patch
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.5i2-newline.patch b/meta/recipes-extended/man/man/man-1.5i2-newline.patch
> deleted file mode 100644
> index 611df5d2594..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5i2-newline.patch
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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)<BUFSIZE)
> - end++; /* note that buf is NUL-terminated */
> - *end = '\0';
> -
> diff --git a/meta/recipes-extended/man/man/man-1.5i2-overflow.patch b/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
> deleted file mode 100644
> index 52d2881a893..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- man-1.5i2/src/man.c.overflow Mon Jun 25 00:01:45 2001
> -+++ man-1.5i2/src/man.c Mon Jun 25 00:01:45 2001
> -@@ -381,6 +381,9 @@
> - strcat(name, "/");
> - strcat(name, beg);
> - }
> -+ /* If this is too long, bad things have already happened. *
> -+ * we should quit IMMEDIATELY. */
> -+ if(strlen(name)>sizeof(ultname)) _exit(1);
> -
> - goto again;
> - }
> diff --git a/meta/recipes-extended/man/man/man-1.5j-i18n.patch b/meta/recipes-extended/man/man/man-1.5j-i18n.patch
> deleted file mode 100644
> index 2ae09c0ea49..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5j-i18n.patch
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.5j-nocache.patch b/meta/recipes-extended/man/man/man-1.5j-nocache.patch
> deleted file mode 100644
> index 751dddd53b5..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5j-nocache.patch
> +++ /dev/null
> @@ -1,16 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.5j-utf8.patch b/meta/recipes-extended/man/man/man-1.5j-utf8.patch
> deleted file mode 100644
> index 33d3e4c9745..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5j-utf8.patch
> +++ /dev/null
> @@ -1,61 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.5k-confpath.patch b/meta/recipes-extended/man/man/man-1.5k-confpath.patch
> deleted file mode 100644
> index b5746c2df80..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5k-confpath.patch
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.5k-nonascii.patch b/meta/recipes-extended/man/man/man-1.5k-nonascii.patch
> deleted file mode 100644
> index d662d9b6a70..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5k-nonascii.patch
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- ./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/man-1.5k-sofix.patch b/meta/recipes-extended/man/man/man-1.5k-sofix.patch
> deleted file mode 100644
> index 50b925288ec..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5k-sofix.patch
> +++ /dev/null
> @@ -1,24 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.5m2-bug11621.patch b/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
> deleted file mode 100644
> index 051299906b8..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- ./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/man-1.5m2-buildroot.patch b/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
> deleted file mode 100644
> index bc97f56b9af..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
> +++ /dev/null
> @@ -1,52 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- ./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/man-1.5m2-no-color-for-printing.patch b/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
> deleted file mode 100644
> index c85ff1d8c72..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.5m2-sigpipe.patch b/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
> deleted file mode 100644
> index 8af78eab7b1..00000000000
> --- a/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.6e-i18n_whatis.patch b/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
> deleted file mode 100644
> index e321325d63f..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
> +++ /dev/null
> @@ -1,145 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> -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/man-1.6e-mandirs.patch b/meta/recipes-extended/man/man/man-1.6e-mandirs.patch
> deleted file mode 100644
> index b240064c980..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6e-mandirs.patch
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.6e-new_sections.patch b/meta/recipes-extended/man/man/man-1.6e-new_sections.patch
> deleted file mode 100644
> index fb9773c646e..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6e-new_sections.patch
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> ---- 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/man-1.6e-ro_usr.patch b/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
> deleted file mode 100644
> index 1d1cb0c724c..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> -Index: man-1.6f/src/makewhatis.sh
> -===================================================================
> ---- man-1.6f.orig/src/makewhatis.sh 2010-12-29 13:42:34.000000000 -0800
> -+++ man-1.6f/src/makewhatis.sh 2010-12-29 13:42:35.667428347 -0800
> -@@ -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
> diff --git a/meta/recipes-extended/man/man/man-1.6e-security.patch b/meta/recipes-extended/man/man/man-1.6e-security.patch
> deleted file mode 100644
> index 312a882f063..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6e-security.patch
> +++ /dev/null
> @@ -1,62 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> -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/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
> deleted file mode 100644
> index 568f742100c..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_std_way.patch
> +++ /dev/null
> @@ -1,160 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> -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 <string.h> */
> - 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/man-1.6e-whatis2.patch b/meta/recipes-extended/man/man/man-1.6e-whatis2.patch
> deleted file mode 100644
> index fc4ed3135dd..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6e-whatis2.patch
> +++ /dev/null
> @@ -1,59 +0,0 @@
> -Upstream-Status: Pending
> -
> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> -
> -Index: man-1.6f/src/makewhatis.sh
> -===================================================================
> ---- man-1.6f.orig/src/makewhatis.sh 2010-12-29 13:51:45.000000000 -0800
> -+++ man-1.6f/src/makewhatis.sh 2010-12-29 13:59:35.399799412 -0800
> -@@ -164,10 +164,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
> -@@ -180,13 +185,7 @@
> - echo "about to enter $mandir" > /dev/stderr
> - fi
> -
> -- # kludge for Slackware's /usr/man/preformat
> -- if [ $mandir = /usr/man/preformat ]
> -- then
> -- mandir1=/usr/man
> -- else
> -- mandir1=$mandir
> -- fi
> -+ mandir1=$WHATIS_DIR
> -
> - # if $mandir is on a readonly partition, and the whatis file
> - # is not a symlink, then let's skip trying to update it
> -@@ -207,11 +206,6 @@
> - fi
> - 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
> -@@ -447,7 +447,6 @@
> -
> - chmod 644 ${mandir1}/whatis
> - rm $TMPFILE
> -- fi
> - done
> - done
> diff --git a/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch b/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch
> deleted file mode 100644
> index 4631d2d0635..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch
> +++ /dev/null
> @@ -1,105 +0,0 @@
> -Fix a build error when building man.config.5 (a remnant of a long
> -ago previous patch). Optimized the manpages Makefile for parallel
> -builds. Also, fix compile warnings in a couple other files.
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Bill Randle <william.c.randle@intel.com>
> -
> ---- man-1.6g/man/Makefile.in.orig 2016-03-28 17:31:08.723949180 -0700
> -+++ man-1.6g/man/Makefile.in 2016-03-28 17:46:12.866910386 -0700
> -@@ -5,6 +5,13 @@
> - ALL = man.1 whatis.1 apropos.1 man.config.5
> - MAYBE8 = makewhatis
> -
> -+SUBDIRS := $(shell echo @languages@)
> -+
> -+.PHONY: subdirs $(SUBDIRS)
> -+
> -+man.config.man: man.conf.man
> -+ @cp $< $@
> -+
> - .SUFFIXES: .man .1 .5 .8
> -
> - .man.1:
> -@@ -19,11 +26,11 @@
> - INSTALL = @INSTALL@ -c -m 644
> -
> - # Where to put the manual pages.
> --mandir = $(DESTDIR)$(PREFIX)@mandir@$(SLANG)
> -+mandir := $(DESTDIR)$(PREFIX)@mandir@$(SLANG)
> -
> - all: $(ALL)
> - for i in $(MAYBE8); \
> -- do if test -f $$i.man; then make -f ../Makefile $$i.8; fi; done
> -+ do if test -f $$i.man; then $(MAKE) -f ../Makefile $$i.8; fi; done
> -
> - install: $(ALL)
> - mkdir -p $(mandir)/man1 $(mandir)/man5 $(mandir)/man8
> -@@ -38,24 +45,27 @@
> - rm -f core *.in *.@man1ext@ *.@man5ext@ *.@man8ext@ *~
> -
> - spotless:
> -+ rm -f man.config.man
> -
> - subdirs:
> -- @for i in @languages@; do if test -d $$i; then echo; \
> -- echo "==== Making the `cat $$i.txt` man pages. ===="; \
> -- cd $$i; make -f ../Makefile; cd ..; \
> -- else echo "==== No $$i man pages found. ===="; fi; done
> -+subdirs: $(SUBDIRS)
> -+$(SUBDIRS):
> -+ if test -d $@; then echo; \
> -+ echo "==== Making the `cat $@.txt` man pages. ===="; \
> -+ $(MAKE) -C $@ -f ../Makefile all; \
> -+ else echo "==== No $@ man pages found. ===="; fi
> -
> - installsubdirs:
> - @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; cd ..; \
> - else echo "==== No $$i man pages found. ===="; fi; done
> -
> - cleansubdirs:
> -- @for i in ??; do cd $$i; make -f ../Makefile clean; cd ..; done
> -+ @for i in ??; do $(MAKE) -C $$i -f ../Makefile clean; done
> - rm -f core *~
> -
> - spotlesssubdirs:
> -- for i in ??; do cd $$i; make -f ../Makefile spotless; cd ..; done
> -+ for i in ??; do $(MAKE) -C $$i -f ../Makefile spotless; done
> - rm -f Makefile
> -
> ---- man-1.6g/src/gripes.c.orig 2006-11-21 11:53:44.000000000 -0800
> -+++ man-1.6g/src/gripes.c 2016-03-30 16:32:31.601103487 -0700
> -@@ -7,8 +7,6 @@
> -
> - extern char *msg[];
> -
> --static char *mantexts = "man"; /* e.g. /usr/lib/locale/%L/man.cat */
> --
> - #ifdef NONLS
> -
> - static char *
> -@@ -30,6 +28,8 @@
> - #include <nl_types.h>
> - #include "../catopen/catopen.c"
> -
> -+static char *mantexts = "man"; /* e.g. /usr/lib/locale/%L/man.cat */
> -+
> - nl_catd catfd = (nl_catd) -1;
> - int cat_is_open = 0;
> -
> ---- man-1.6g/src/manfile.c.orig 2005-08-20 16:26:06.000000000 -0700
> -+++ man-1.6g/src/manfile.c 2016-03-29 09:10:21.527841285 -0700
> -@@ -299,7 +299,7 @@
> - const char *((*tocat)(const char *man_filename, const char *ext,
> - int flags))) {
> - char **sl;
> -- struct manpage *res;
> -+ struct manpage *res = 0;
> -
> - standards = (flags & (FHS | FSSTND | DO_HP | DO_IRIX));
> - to_cat_filename = tocat;
> diff --git a/meta/recipes-extended/man/man/man-1.6g-configure.patch b/meta/recipes-extended/man/man/man-1.6g-configure.patch
> deleted file mode 100644
> index 106cc987819..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6g-configure.patch
> +++ /dev/null
> @@ -1,68 +0,0 @@
> -Use BUILD_CC and target include files for configuration tests.
> -If cross-compiling, force pathnames for helper programs, since
> -autodiscovery by the configure script will not work.
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Bill Randle <william.c.randle at intel.com>
> -
> ---- man-1.6g/configure.orig 2016-03-28 17:46:12.734910976 -0700
> -+++ man-1.6g/configure 2016-03-30 21:47:45.110572908 -0700
> -@@ -216,7 +216,8 @@
> - INCLUDEDIR=${INCLUDEDIR-/usr/include}
> -
> - rm -f conftest conftest.c
> --compile="$CC $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1"
> -+# since we are interested in target feature support, use that sysroot
> -+compile="$BUILD_CC -isystem/${PKG_CONFIG_SYSROOT_DIR}/usr/include $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1"
> -
> - # Check for various header files.
> -
> -@@ -455,19 +456,23 @@
> - fi
> - 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
> -- 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
> -+ if [ $BUILD_CC != $CC ]; then
> -+ # cross compiling => target fs not available, so force defaults
> -+ Fgroff=/usr/bin/groff
> -+ Fnroff=/usr/bin/nroff
> -+ Fjnroff=/usr/bin/nroff
> -+ Fgeqn=/usr/bin/eqn
> -+ Fgneqn=/usr/bin/neqn
> -+ Fgtbl=/usr/bin/tbl
> -+ Fcol=/usr/bin/col
> -+ Fgrefer=/usr/bin/refer
> -+ Fgpic=/usr/bin/pic
> -+ Fmore=/bin/more
> -+ Fless=/usr/bin/less
> -+ Fcmp=/usr/bin/cmp
> -+ Fcat=/bin/cat
> -+ Fgawk=/usr/bin/gawk
> -+ fi
> -
> -
> - for i in eqn tbl refer pic
> -@@ -507,8 +512,8 @@
> - jnroff="$Fjnroff -Tutf8 -mandocj"
> - fi
> - eqn="$Fgeqn -Tps"
> -- neqn="$Fgeqn -Tutf8"
> -- jneqn="$Fgeqn -Tutf8"
> -+ neqn="$Fgneqn -Tutf8"
> -+ jneqn="$Fgneqn -Tutf8"
> - tbl="$Fgtbl"
> - col="$Fcol"
> - vgrind="$Fvgrind"
> diff --git a/meta/recipes-extended/man/man/man-1.6g-parallel.patch b/meta/recipes-extended/man/man/man-1.6g-parallel.patch
> deleted file mode 100644
> index 72a88b898a1..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6g-parallel.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -The Makefile for man has a rule to create two generated targets with
> -a program run from the shell. Because the rule was run twice, with
> -parallel make, the generated files were being overwritten at the same
> -time they were being compiled. This patch forces the rule to be run
> -only once.
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Bill Randle <william.c.randle at intel.com>
> -
> ---- man-1.6g/src/Makefile.in.orig 2010-12-31 12:28:46.000000000 -0800
> -+++ man-1.6g/src/Makefile.in 2016-03-28 09:09:16.845458798 -0700
> -@@ -43,8 +43,10 @@
> - makemsg:
> - $(BUILD_CC) -o makemsg makemsg.c
> -
> --msg.c gripedefs.h: ../msgs/mess.en makemsg
> -+msg.c gripedefs.h: genfiles-stamp
> -+genfiles-stamp: ../msgs/mess.en makemsg
> - ./makemsg ../msgs/mess.en gripedefs.h msg.c
> -+ touch genfiles-stamp
> -
> - # glob.c does not have prototypes
> - glob.o: glob.c ndir.h
> -@@ -117,4 +119,4 @@
> -
> - spotless: clean
> - rm -f Makefile config.status paths.h version.h man.conf
> -- rm -f gripedefs.h msg.c mess.*.cat
> -+ rm -f gripedefs.h msg.c mess.*.cat genfiles-stamp
> diff --git a/meta/recipes-extended/man/man/man-1.6g-whatis3.patch b/meta/recipes-extended/man/man/man-1.6g-whatis3.patch
> deleted file mode 100644
> index 63344568575..00000000000
> --- a/meta/recipes-extended/man/man/man-1.6g-whatis3.patch
> +++ /dev/null
> @@ -1,20 +0,0 @@
> -Do not use absolute path for awk while getting the path of awk
> -when running makewhatis.
> -This can avoid errors if path of awk changes.
> -
> -Upstream-Status: Submitted [man-1.6g]
> -
> -Signed-off-by: Jian Liu <jian.liu@windriver.com>
> -
> -diff -Nur man-1.6g.orig/src/makewhatis.sh man-1.6g/src/makewhatis.sh
> ---- man-1.6g.orig/src/makewhatis.sh 2015-02-25 16:13:12.657611419 +0800
> -+++ man-1.6g/src/makewhatis.sh 2015-02-25 16:14:49.334694815 +0800
> -@@ -67,7 +67,7 @@
> - # but that leads to problems and bugs.
> -
> - # AWK=/usr/bin/gawk
> --AWK=@awk@
> -+AWK=`which awk`
> -
> - # Find a place for our temporary files. If security is not a concern, use
> - # TMPFILE=/tmp/whatis$$; TMPFILEDIR=none
> diff --git a/meta/recipes-extended/man/man/man.1.gz b/meta/recipes-extended/man/man/man.1.gz
> deleted file mode 100644
> index c368045153406ab730aad35bfc7ffd91238bd47d..0000000000000000000000000000000000000000
> GIT binary patch
> literal 0
> HcmV?d00001
>
> literal 12323
> zcmV+;Fx<}{iwFP!000021Jqk<bK6Fi{f=MJrP^9aQxt7ElVp-fQj#6nX2p`cBpoLc
> zx?+%Ql30NNg9bz^>)qeJ=RUg8AnEK>&FqIsrDPK5$L-tqaqff1lOt0nef<5?pUik=
> zO*$>_t;w^(8n-H&d~OzHHM6Fk=B6&q6eG;0vYV=$S?9_M^LYAoT9{3`v^3nT(}EuI
> zi)ZELp~{x4+MGN)HRoS__2(Y_{k&&hRH<EC^R{o^W;v$K`{sl`^-m8>eDe75d5``+
> z;lH2p-!J&@m;CoHm;kcP+q8CN(GUCoTsENR!OSyPSJ||wt!aw6txS#6*0x$ZQ!e<+
> zi<>v*g)MBA=H_)X&9fOV@G6_x!r|P`xQ(4<i_FdqHlituEVt&_?dzWhH!tuYt<9`l
> zTW7Xey`llU0Jw2BpSA>KF?l1*xt-PK$yet5v#%e2_4Q}x=Ee1x8D*F;;L3}>a_GX^
> zzH6$=KJ?RBzqvb=bvB@M{L)-s-k5W9^yKmR<Fm(4&d$F$!k7N%{V(w^?x(@I=!z->
> z8ghquqnGC9^7<+Pg=TVQ@HZ>Kl0`}vUh)ac;*5o%vI|?;0x#CQlH=K<pKoqoj|L+?
> z3W?8B`3E*&+?)j|=|2^T7(O+>Og>_#XGwoB6y{AnzKdSWcfNnW^L=u*O{*d+mJTl_
> zIQ4KqZ@x9r<9FRDL*5INmvao*S??9U%*$E2N6MOCxd&I<HD2LiuRr-H|L<&Z%|kaS
> z?!5bAB+KLCcV1W_>O&35f;jBF&G7vre;Vwazp_jFA-o4avV1;EtNGr*B84DM&dMTx
> z*m;-kd~f#WmXkBrOi5VW&db+&RuZG`n@ZkP<$AMw+%I>&U;WXY$o8v;&B_*Oz0Vza
> z|DTPkp^CFZBQ|n%(6+tBcPSfp<jBnJJ+ysah+cMwO{;S2gaO@gKkY2H$@a(mO-bM(
> z^vKy+dkAH&nV3l0{O6!%DcHOz-Hw_~tDtI6vC&<iLx=O~<%TxXYaJMtr%f{X_uVbd
> z&X##OP4lzAYp)-o18#$OzWsakVPE10dlKJ1-DMbAakI~)E$ngjf6%=Mi^}LjETa23
> z$RM^Gf4qMFFJ|@r|JD0nLOBO~O$RT1yMiBlr2n4H#N~fN0ES&{_y=U+52O$zkpKQe
> zF`WIgw>~>t*?ePY!?Uw{Tag#*>>5^C{V2--Eqs49dNv%q9uIDB{5a?*p$u`e$4<e8
> z2w>k_rL$EaAgz|o+7`80X7?8GtBlqt%4(hF@N~2oc|O8)1XRmqm9BdXc(VGz0GlqF
> zVkQu5O!#aNZ<(Zkw6iR&f$$i@SrDM`kPx6!;Ea%60PF%wG8cgEHhKDB0b(yj!qrIi
> zl59bQ+-Gw;?_t?I$KVQYJ^eshd0E~WcGV0l)0zm=6%vJ~LMM|ARam4=UYk_*AaY8K
> zPb-j%6~GD)YSa5P%hPFYW1<|WT9kQSZb=Cl(4S#RNX{HAB5+Jcq9s@5R_GG6Te&*i
> z2cNxXEL}#n2#@Utn0H51IJ^QD>~7po_y9GLglGaJ@Fq^sa(n2aSx+HWrgL~BM1#ty
> zP*gu`ERPYWf=3TfgrZI}+%GWkD8WYN<l^+NNp8Tq^NXtwcGk%5Djklb!a<yaDR;?}
> zi;)07n8@6j6E8F_+@z=A&Q^uZPm|9sUS-oNtseHLkR*W}x*Zgh#%0!>CV##dQA9xp
> zgF0eT;~ExYkt<A^EC!EY_a=+sY4Z8Sb5hy`$vQYpSA?^I{j!Z+@@QMn9&I4U+c_pB
> zUtGK(9GHB0G5)XQI&(7|Gc9b{V6&{4<qcctbvmm`@Njm=Y}{G-w3pcavX9lDf;(9C
> z<jd0@eOp%LVj<s?@qZ_O@k~qS>#U$?N5GlqYI{7EC<+v-vaC;&uP%OIF5)W`wEzV$
> z9XFWiYRm(;Wdkz4N|H+zgdlAo)3Llk22|dHtU&^vg;TW8**=hf(&;T*X$pd%67<nW
> zH2U?~?alMSi#NkdGFtj9GGqGWmcRHpS3eEL6EhlLj^Fr4!>jR|;mySSc=_s$-|1>N
> zyd8!)H$M)Bw>Q^UH)DPBeDLbZzy0xQIEpqPqHc%Rh&d-_e5(&{ZpUH#(>E_#VlJ;=
> zzw&!tz8SxiO~F_>@72}BT)rCJdd+O@LM&YAW<y4x6g7R?27aEYEHiLJQ-s$J>VarE
> zHOmI7LSkHES`}Z+zG_0ArezMRgQy5HbwR3)2niMr8&m8JD^bv}K~|@T&BMUT!teqY
> zu)zkMK&us*@L;a{3B(D@Bl4NfFay$bkrwO>$WXRcT^02g^9~QK!oXB$!(>`y_)(Xd
> z($*d*&TXEpvs$deN8&?K)`1muxwLeCCf@IcMLb}==sX^hHOHB3%2rB=9{{9R){&c)
> z6LjYf>7GFH-oW@wJL|GST@i!vm@*<_2_DQnS+O}r7Hk|!Np(OqH%+Y|te-pw_p*W%
> zbY^>`mEzgFhU@v+&O&Nr10y#FMw9QXnu5S9R!LHZ@ELgBV?pAjAOP8n7Xue1XOpXk
> zf@tPtQ(2J~ro*Ol6<`m9B42N?UK8w5Mxu#m9eawi^_ec1RrpVAnIPVA8PT2<_oc*`
> zklFz(QVDD^OC1@Inpc|NXU-opY-58lvL9e(91u&q6mSO3Ws%lY(m|zS=a+R*QJ;~N
> zYBl1i@oO{L9+O=*#|;)?JcD2;cggnxNn-yQGIZ)~A+zh`L_O1~gazcIv8-QfA{hh9
> z3{|CHv&a6unaxDfdY?iZIxE`UdH<{sOA~1x+zgnhf&Jj=Z%sy`RBx?qw*)&CaEbT6
> z%Lt1;C<$vhfcPtkE1+R{2ClOPF9s&xR21!O90@Y+eUC{Y-$gpjF~fT!OC0wSFXgG?
> zhG-&jMpI`B(&%Pu@{~!*@R+@3B3_)OeUrh`;gC8F){ByG?55@tbkUW>uupYy5iba~
> zd9q%Yt{%;*Yy;CL7?XoYLhOl(I*TpmG_mV;l|k;?lrEN<G5~4qJ(!q?wc8Vpe8Qm`
> z7DNdCXi=8^^AG*y?+}^qCZ>IY_c%ioj|&pE_{s*0S+Qs@qo7kk-<oRHxfznGXq$xD
> zof3^2A7+KvE(#S+u<L0;;7S+>lflqi%|K!4#ANPL*Pe8oEb<iYFKtN8mDiH{mf396
> zX{@W~c%884DN2o6cq5%PV`gLGeP*{ls0eWhi8H=BTIvJwhfP++zEW?4Q_a}By;9t=
> z2kpCy4CxX!ZtsTfa2G69i)17*0>@mdvLbu#cv<oC#k`{gf|S%=0O~$$5gjo0lGRf3
> zD9a{KE7Q82e)5{$5(`)-*{WJlbp=(vPjk8#X5YZ)rHIBV(711Y7I^2@uqw$b#7WI&
> zS6SVzwhnYSYgZuV6Njcqu~5i;h)78cc^Y|PBUbnpxa`Nl)!XEnZI5SS71_WzOf59F
> z!gW#zOER~nyIbUlnWhq;rd{JlBtr@zRL@pv!PZkS);gVs0UGyF{<#-GE^pQIau{@*
> zfuF*$sa>V_85B$|zT8-Gkc4Mop>tv;1!(ZA147qzkDx(Dv4bt{v#KmO9H(b=R5>}@
> zE=Xo7T0%>)Yqtr52)_ro&H_ue>5$dOZhW@)Gw+j+!$zE3_&2I{0C!XLOx)LmQr1m`
> zc!T2WG31Ud-;+3go{6{z5t2u(n-l`VGNCtm>;go@eL2Q8ke_se@o=3mAsP;*$rKTk
> z%Tu>H^@cZLD~C1R4%raPl0|{uG36A*Y`f%>Eh(K1qE%T)C!Z741)_Kh5LE(kRM{Mc
> z&j+WDGa)ir;&qSac6K3zMl6rqxZjf=XGMp24kjo;l&CbebuqD{n2^=kPHxnA|G{2>
> ziB2ihU>N`--s7$Sl#i(dsoEN7i0W=#Hl}$Ehqhcv=+D>VYFZkiP5A}z0@|E;Y`EU7
> zf`LryeB?V<TPy`Tpq4x9Yc%()ha$D?VLl{t0@6T&P)V_GV@?vuH;-~KRz#3QPA#?J
> z)S={-VrwhR?A{aS1vIKApGiUsNg)%b3F{LvX=R~R+sL*>$rIk;)KldIW;6SvEEEvA
> zS){J!;wTjZ7X(XI={(9V?GVL>sIxUI?II)005=*(VIAxWJ3=yS9a#r)WWnt=3NU&d
> z)dBMX^hH})aD}~<U8k(;9R5QKdWvF*iRJX3x2B~FD|Sf8063yUx^hu($y(t>vzhbQ
> zDxGH%??uez@WNlTV?*ev(;$z}oa#dejYxh?$Zbzh$dRUOV6quI&G`0L8B8NMOxRj=
> zS|nK+PhhWR2;=z|dq6_qstKIgrP|Gu*z1i$3w7X;bjg6f!P~HXU(cu<5QymuNDH_H
> z7p_{e%W_ChbIm)D+Ef%-#^S%IN=Wf1I31W2g1P?W==~e`zT<;z%B<QDQgj*{D8Xm1
> zgOz1B^xi8|{%|aYfC9>({jS+;NQFES#SDd=f<YxWN4~OH_Q<p<4DYdkg(9x=KCS;Z
> zbJR0OrvE$ske=Zq@bDowH@7&KfWqP-5J1cd%VI~ihM9|*nRrihSCG??D#V6vo|Lhl
> zT;{Iq(#jiPoB$@==e!}fL|PCXoOO~<vHTq|74Q%#_<Jb@9=?f(7J&}TqsCQ_+zP8c
> zA|)Z|(T6{spAWy_hm>Pr^GqZOqAmr3lMnPX#u7PhMMhK6?MdhW4hs<Rp|67-UrV5R
> zCE8rIWh&tlv?+D$VbnC&>~DAbJeVOzoPB*679DAF(wsbhIXXR}M1RfslPNi#x)!9z
> zq;XJcZ0;<Ze#xE)$Z}-qDa%gMQ1U(Z%qF*_3LtLoQ4)6-oP2(|H+Q>w=**=_!ULs`
> ztQLVXDW+2%ROOwr7Xha#Ldt?O>?b#vK)pZ!o()|{2XQmXm0+BvpTJkNi-D{MXpok5
> zP7|2p;64XhcuYcqobd-$GVVEXLN}o#_B6>78!rYVHX{V9P~g?GU$3u5qsteP|CDE!
> zH!mohN()Urio0qf!$Sy`R%g1yk%iPY;6ET3=JoAp@RK=z{P?r}c|s=4hp}HLq08rn
> zyijT;GjT<CbWAXC3wI5GS(_zcFF~S;4#KN#TCjJQwT1)pO-tT)zeq*%srgk4o8M3-
> zt;$%TzT@@+dEXE3XHZTs+g4}9$aqXIjM0J~y?v)8QgYpr)NmQ;8mnkWf-<@ExVGF2
> zZeeQM3K@;eGuwE0;srGc^?}Q^tupfDSH&{V0H+l`BqJ5w1!o^)p<a`KFo>$tyj(Vx
> zGi)i$pjp5RaI%o^48BGsJkD8r@e7?@Y(ch^=}MQ3<0AQH9D}oZz_Xt|(olMzCKBvC
> z^O=AyHMn&`6nh*s#f~D<+O++avkQ54$6+Qf&DL=pEC}PhnI|uk#9IXsE5o(SN`#6T
> zZ2`1E%9k)N5R8J~lI3k(IHLWulB_VRm9kcj8+pP5b|p>%Rvi;3a#hYW3%|=E+gc<k
> zB0s-;^J+Zmpu`p<b%eBYBW<=(5|f88yb&qy0#Xtrt~o;%WMGRsXK<=3JG*1YZY$!H
> z;LU(rZP>(-!E7iyOfb|U?AM!V@pNC*42!i}r}>uBoJxTj#Ip9Sc9d+7%_Hz_i$>E$
> ztsYS!k%Z_RoMEB@q#itH&M7!O-qcDP<E*TzhO&q+%Pr-zd+kyOSm1-foNLBva<vx{
> z<UDlKz+61YbJ`s`+8(RrVib-^U6E|!&JkGqA9*gHEBj91p)af-O40e99)_Gstg
> zflaMju_MCfmMJ5Q1PNX{$pkVz2u$Z}C1hGRR9Vm@N&yH!j!`&S59M1fDJ(|PJwt75
> zf_y}qsac>Xb?BDT5fqqH4J)~&=F7AT!7zYhT(Y-(k?AMIku4R4)kH~B*<4HtRu|=F
> zn2a@!h43^d#e6VY%qQ-%8{YcRFl1;oxjNubab8+KxTjzu-hh|R+B)!Ql>W8SMnPQ_
> zN$?as(;^3soI-w8BKW=Z1NA-_X&s;`q&PjgeS%(Q|B}+gXVf`+P6-`necC~cz-!9X
> zd%ShZ2j%<WDH^JC#=Okud(7bz_oDAKC(EIeh!5*k#qpZYsfBg~<+fIb*0{lpZHDCG
> zQr?_dsmBjk{v<WwW@%81t)qK{%yi=O4W;Ke=Ac4<EYF?He892o_Ub8#nafJDr&2-Y
> z6N;_D1!o%qG?F2U?q+RMKtJ=GdP?$#UYwOmqI8km!X{D6eh9X;8KL3r^XH?h|42Ai
> zYV(j}*8Mu9Q)FhENa7BIK|hicpK(%4s9Pl6Yi5<BJm1{M`Ei%Lq$k<H_{>l$nW;nL
> zdTqOn?8ea^S%Nj4m(FrLu}6IHZ+z<WyCh-gD1`}n<kNE+TTZjW=Uz?D0gBUX(NwKl
> zhvQN1w<!6<Qr_bq2&^q4rFm$FkqkQDdyE&z9(fG|8xz&CJ~eWvSs==(0LI5;m12{{
> zxq><tCcP?1?HZmg@m58GfD<)FrF{Lx)JyZu@FQ|R+KN}3(?oy@^#Bnam$_oddrLBy
> zaoX4JwFqgO*nIkHu~^s1iG;QCq^2i3o3uSpKK)i#uq)K<;yt*hq0M&;I1C^mVrv*7
> zO3g;J#^j*LkmC531&xxmBG%f+h|aM&BFlBe{hDc;<92=hImkc$pA<=?HzuKeo{+Nk
> ziCsy;lbvXQ`PhePY<DP8-8+zo#u26^6+S$CMtHMcG`YmdoqZ&GZsXi}PZF4ZcTx^E
> zeVR%a{045{vxN@iLvb61qa$<Ve=(w49fji6<m}nRh-v6exBv^yUu4V489n<}I!xa<
> zD~^(?JVpjIS|Z`8_`Hh!N+<y@IMDi^M}40h@MSaV<m~Z&b31L8T8-n+ODT~A{fwr3
> z@25!3dfdgJp}!KIqG{9ojIhK^=~%idE+zOx`mswworzl{YUj^DBF_ic{zWN4)SZe4
> zUtCBSG1fU$kbovf6*!(GeN4Vk5mJRjcUDQM+}One4l;BL#GTfY#p_?boh$~?_jk!v
> zp`Jn8uE|RAHE;>uXlX-pK-&A`aTp@Xf+~EB&zu);Rc+2QlT(!LHb%&O&W`F<2{)~<
> zG9Ye;pJ7$uPI|^UJWA@df7QIb;%OgFNwzY=J4fqucGOQsR^0mJB>(NLKkP~M8zyt_
> zmZW$WW!tv^Lj1;2oEMXzs&P$jZjEKQ$Qo*YN3GN?MCvpLyjy!6`WF6v=w(UwE4Zz%
> z=(b_R0lUE|;{{L7Ph(sc>A{^)<P+ZeB>A61^!ID&F*NU#m}x7mp1ZhP*ho~Q^>I(5
> z-{I3l{vbq3R<<Q}6h*<(7sUm=IP6jpWoepLa6o7B^F9fndmejIPC@(qI9WwqPn1|@
> z*`m|~kVP+{586*6E{5+%3(&04gi8hf2HfX6b)llZHZ!$aksz1sxyrxHQ&n==dXroA
> zbYM(m2u~T`?{^_M>PZfvy#9(L3g`ug1disyQO;Y5fle-cM)EyBJ!VPn`+lML7Ug#!
> zzD1d<1?ttMEtTsPT<WTPtuoo|c%Q*sS#3<e+N})km3kT7;;6NDS{B`QnFyXI6vI=Z
> zL5zN1e_9!WuDyBAH>qe2mV({3F2U2=->rq*UL40wAEe^wE8J5{hgW9NM+)lvk0Zqp
> zE6VEwB}DN>Tc+T+>v(c@EW+vZ+%YWm@P$AEwLEyzNPyKwxOz@~;cuz?u-<iW5)$-$
> z4~*%Sx@wI%J&2h1;MOQr5TA=f2?QOL&-^jiBb2({)Vvnu;wajeB##$IiZog?9m=Be
> zLk4c7C4R^^f<k3^M?=^Y7YX;sN|#L}&|7a=5fQYq&G`O%&MRY*BwOc)+XS^pGB34*
> zrd~-poR&Cor#=8WP$^^G-ulj`5dKHRy^V;Q&<|L;6!N2gE}34acByNBwm}j`zt$lR
> z(=XQuPZF|h(Q{9?kf*^3b6m@*`{;x-Ig$J}XCF;T2HXEwmLL$v*kVh$JKh5b>ExhA
> zbuA4^`Vr0?0%!VPTTK>2LYs?$T0K0qct%jh4@m~Caf+g_-3~~NUPM7T6Ryof1mWb`
> z6K)Z&wAF{j!85D-6R?mm_lYGcTWaX7LwqqHj&;=2NE*L!))&KQTXv6<;h@w=l%Z^S
> z%?%Fjf7`p(=C+Y5`yIam#fn#Cih?aUe#D7)<cDl)W6Lg4j-5oQF-U?EYzp82peatx
> zkKg<3z72r(OeNV*TT>p9ARdi=-p4to={8LnOJN-}HwZ`K;EZwP!OZW<gfk%q%{ceV
> zd2RF*a>S(9jbIFdcR+t)>{ud^CI>JOS^2n{3x0CM3Kq8Y3<K%7(&f02QE@El(PTr(
> zwtA5lLf!B$VSSI+&?httbK%!E@H-^^W+Oe$ymx3VPCU$zY7RYKZbUsDA=%p6&m6*<
> zS_Uk0Idgb-6fqvd#9``h!^g&&8Q;c^nbOVhF>%4=_+kpF-~?MDsRp?v#&z@WGiRS|
> zOk>S<5lkp@;v_Y>NeQWF_fp%B(Q2n<BY+gmZsC9?Lx~-VcwIF4(qi*)v`bz{<}+A6
> zz#D@V?=251pMcI{qSk5hNPtq5188T_OjHW)XkM0I!>bHDUpus*IFxmc?M<`=?6&uD
> z0i~F+0!#?ujdtHBj*skdSb*kv!5UQ1W}A%NsyW}?vquo+C?LLOQ|>b@5$=FEM*2M^
> zYJuXGk~n$yj;)1Dj^bt;jHjhA*{!a|Ot({`0j`xJ$=M_x!dR*rANtHG!#f&_!ov-$
> zE{mLlBFWh?-C&rJpBi2u)%8xMaEkh{nRdba$*u|jA>nwcm2}5re@XjvxW~lhcO)T=
> z5qwUg<GXWGO&ldm$Mw)6DYA|<HyFHA&A}TqmFwCxGEDyqQwL-aoo1W2lkoP&5XH22
> zW^j0}T99poR|;jw*Hh#pO&WS^2Oi0VHH4Y=%c=tjWfz7P`4sdPvP4Ka^n2A5>Ghsq
> zN;fxnTx&S`5UrUVy1^ixdM1CHoFBi5`sOj{McB#QMEnLOVv5hmG%Vqo$8<27sNaN(
> z6~`ho2lr@b(MzJIJ`tvcM`*fyru!g$=PQ}&^DKbfisj08<9ZBVQQxjMulMH3>ANTA
> zuX^84vgVA95Bdc|<nzk{!8jD-rRN6V(A2%00+?t{DoYM0^aG3{w>}CQ-mytj8^QMB
> zR+L+jI}I5WG{AmpZ_XWJFruD@=={(efK|W7CZ}oHV9pR=o%s~;vO|iv*q`9ai}4X^
> z@H+Sg-=*k}>1gyCf0EeFvMlzQ+|(cC`NZ&Xsn3~1W9coU-`2vD<7ekPdhqaEU$Dj@
> zy<Ae<kmDFQ_rtIgygK=cLi_wH3ir5b$l%56^>p7mi&6vbz~k`uXo9PaW{qL+mK84Q
> z4FVsk%gobLU7Sqk!w|eh^l6wDv7Cjop3i4XMOqk&4uME}`yBNPg5^|9g`u!JC4{j6
> zY7uVAF37;+M`*gS{EX}dmRm56#!*l#x)SX}M=ZiMAB>^PA`|efx3Z9Z@T3+*U=6kg
> zv`VwaiNm7<HUY|TC2(p@yh~u6;sVMw8!P3TA4@I`_p|tuYoa|dBCf}Zr6Dfd*uGmc
> zTf(4vPos|QN+0<P^NV821QinzQQBz@iQN_48rr4EF3UzBzPOg=U{ks9Grq&uGM^i(
> zoxBaUM_qUd1N+$G=p1Nfpvr0*CwZ}}DiMXDFF^)l*o7SnVNU4;bRn2qB^VzUMv&PL
> zhCCJ!>dQI(oL>W{9z$MZF;4YIJK@3rg9?c}!GtOm!3$L`z!Jr5m(ui7BdLLxDroih
> za4(xe$k~DA*&H2N@V-vy3pF`YIDKeKRKI%Sj3!oRZhtbC#ju%O$=yx#GUN-wk1!iT
> zX*o@2?xJD62?8hyvf&3Ij(z2FNJ@!A|4eEs^{Wlkax50#C+k(7parZOYaA1(UsG!)
> ze49j*yx<6EmBogkSCoQ0mDo9jT37k(3*3J&g(e(uH^Ewt!dmVxKoHKl#z;~vdA>9b
> zDopjF{?F=+?NZ`N?$^zhAYojDdS|^!(T%#5Q|kzCPQ!?4yX=S)3z`K$f?`sXm`_Br
> z4ry#eaU>xIof6IY|CyH4*ZB?YWn{b}3r=$p?W)tVVUT<5UVFJUtiCaWt=g%Iut|Kj
> z1pHL2icJo)J=THEoYC`B$(t;feda1tIdB$dL|Q9odR-!KXPtA>JqSWE!=m;xq^~#1
> zT-1iY;<75sWfzdiBu(nal2p`QBeNvb0TeAy%}cHMrI;cT*i>u)n`dj559ZcSIi=2)
> z8O&CDJvcdR8_a^XAZRd=x5zGAMp+jQH;DXw#)GAn-xJ^mB_u)3%_w{928*?3J4vg>
> z3Fr7gl($^6W(}+7G$+hP*cpv3+|Fhe28c^hK>g=c+iH`RU@4!TR6imTGMjsI(YelD
> z6i~ygSk{e`<wsH&wYz;;IO2b~@Q5o8=HP<M)4Wetf%P_3{gN@q6Q$E$)4&(_OVHDB
> ztTQi)1R<H#)$-Fd&R1`t>^C&%G$gHgW7G@yBHpVn1R9Rlb+-J9Yb-(>#8N=8d9jEt
> z{woISo*Cci2I?14U<*DTax?JX!EHF<Vjs^)4v<WpEb<5qths6$U@f}*y++Tn-u|GT
> zP+vJZqJqDsU|gjB6Yk!A2`AiLUGF~S;CA?46gGWUq96e~G#;49fo&T;eMeq9VhqJ=
> zp)Zg5nDg4%xKoZTo&J5F{VX2vsr&UH{*}J?%j2_NS4~-OxPYyz{u}JRS{X?W566tU
> z&#Ias>j25*(K>TRWO9M|Q9xBQw5jH3br9<soEpAAS{Ob}$BDKr1({ez;iq*;HuKQ&
> zXvw?dVUIs%jOLt|>!~|3qPM_e$ZHUstd@X(fivDUv_ftQSGzPeXP~bz0YyoeXj7#t
> z41)5CsMU*ir}(bZd^M|$7)qRm^$4dbG6F`NleAHS3Og8!>1hw6Z;$0DLp_mQj14Ay
> z45ptVR9m5R8Zu^7eJ~G8-ccztxa7zKDc3~KHd@t0*jXtP$3TqaY)m&YB7lI07qO9&
> z#lYwZ9;4<SqIVUKh)r^W8YCEhx`=NaF!6*v;(1nJ%XKnN_~Teaz=D(1X~TGXs<2xQ
> z>`*%3<P07{bG#-j@X0)hQ&cw)&+t5b<_%)6uJfCRu>nV5u;(kM-waKa(+<az$*#yB
> zKZ#@f?tvn7fy^VvjGAGnqR{6{)<g&{<nHmft0GOtvt!wgN9G1h1@}^|V+B?SDNK5M
> zg{RoAM5IaTP4KbGK0__nA;?T65-J@q?3*L36Xw>8>YBR=cO5AvmO){z8idCe`W;MW
> zKfXJa)R1QA!H<Df^f^S;@3RdWpdk>W($taF^Flrq1!}m>J`MNiv`?eGpkNM@#khjt
> zWt~=s_*F~?r*_D+)8i-V_we^3lh?s7KP(&UbNKPrviafl?OU&tM=FRo-8THo^yv@v
> z?OSz{{D5DF$EVLnkA7G^rQhgJb}K=|EzQc)szl@h$Er3Z^=WY7(H~KsOO10<xgZuz
> zDiJv}{6wA!S`$&$WN)~r<r%d&d07E9`<w$@IN~*mQ46*&!>L|#-3)hv=^D|q%Wy6p
> z6BvA-zfc31nOwarc}Po2A)@3W%PHW)-GzN6!~T`AKpw_2M2z8gX11PYfmWcXszjv$
> zWMMVfby_D+1TT6c2j+#y&5oMICQcsaYh)z4<ltT%g(Vf3F3YLm0@)DI*x6CK#P6I`
> zEJB+B+0Gt+ATC!u%X0>`U>sY-Vb&EZKGLr-D)iYQgrTzd0onMfyhYx<e$HUYM0(9w
> z1h14cNQkTm7g}BYB#gM+azw~XmPiA{7}x<lU7*Mox2NXC%hUH%frSN8h8cW$9e$gr
> zow#qMMg56hhW$j!5~+UKiA~*BX#st$AsD+k7pJYHC5p!`s*|jA*RnXIQf?k`y<sec
> zJRfETM~dw5rNx*>Rt2@!t&+XEzc$g<&Y^YUi+|Ktvwy}HQ4+`Vn&b`G50YP^BwP0W
> zI=tGprTAv}UlKj{4R!Q(20r2uKmLeo_D6(%z;}te^8Jnu@7+7P`29cp6aIO$A5GWb
> zUpDdZI-k$6KbOtu=<xo7ql@8meN=*Dgp&N|9u*B7{{tLP)1$pej5dX3V^I3&?jc@w
> zy*|2O^*RlRxE7n0%k_2PwZUBP9P_g4I=BK0p<qbHVnDy%#P@b)9dy7uj&PTBi@*kn
> zbU-eT(C#qFjEZ)QYe_3+Kf0&}4a`m!H!hu~?i{>wfex`qR{NrEKMzA%yQ&K@%Q;U{
> zl;9!KAD7Zv6WuJCCwDsMuLX6IY@nSSRF6jK5@Y%F%6(#7KTmRhkHk+9*O(SB5k3>n
> zhXcsd<uG*itc2ag{_#$DlsOszq!`oRWJYL>n03-G4B)31oX^WIu3#Iq{ez4d*|+XN
> z>OB?yb(FJVvPL|Ilct2s0fRAfH`dMKA%;pe86}KJU1Oc~mDJwv{rQWF{fDlO&U!`n
> z>2dVKRdg!&ps_C|yBO=HL?!{tH0sp?XHUfppF%GO2ZD8iIrb_M7cftuKSydQ^7ZxD
> z;MXm&70zZ7CoVgP%HliGQbr*oMQfqP6Kez_DzB5%m)J(_OCOu}CN?VH*~ihKiQLN(
> zMU#Vb0_JL!-<t_I#5Yym@RHm%VaZ|MI$Hu+CNM$x8YYB>D;eDa%M}y&7-}*g@s&A}
> zS-3*m7^iVGB`Lb1Ml)9|8|iGqx)xzf#s&UK==Cb@sVF=g2?H=u2lyM2zPLb58A-y+
> z!=j{P`&x@>#zNH&E-C_|-2H?=PdJ{4Z~$^+trdy`V|_4|*x$C>hr^8_d@ug|D|<0t
> zzvVuR#zjf=<%-c-y&Y)*D_k5rcMR4g=i20OCa_L%ahBPliTI{$Vj;M`CTty?IjGXh
> z%WS?+yWb3AHbef6ol0JjjMA*4zUz=y_0C=t|9g6oVu}Vykz(s4#e)7U@&Sv}4U%*|
> zP!t;3cNX5Kk;!yUZ$a5iViqrHp!->Wh4=$D!d-yHv*sQvMN&g~9A<!LV%CRZ!~W!2
> zxaBcJzRl9ZK`~PIjBh&@&}qp^Y7$&eRR&xsNGbOiG(Or-N*Dzp-fvh4r9dioQ=M5<
> zJGd+ajCze7<Pm4he}euW4+n7;k9cXt7Un~jdT0gHA01ig5!~sCjx>7Y>t&Ubj1e6C
> zss}j`K*y?h^sC~SO3&R9Jb4=bT$cz8i@fRq)_Rw0X6wZ`L;@pcvDNoASvuS%h`NGa
> ziiw&<zuqfJ^`M$((udYo)c=kM=??Sdj5d@o^s;kgm4TtbYdliQNJrfj8u@qf3z5(K
> zdF?`J+s{ZA(yPD@ab6V|t?!#)5RIZh$kZj<*t8L&W0yH|(zKG44Jt!%;-N+nMA5`2
> zd+;SbasMDWcrXe?*5_Y4Hp~E}ZRsx>GE#vbAKY`gSsxGX+_4q-N-9wH_y}t7s<~cj
> z#hKr`cs|PA`6@HvpjYQ_UW?6Vgs469Aa&Ba1X0~&Q{8QZ-Ne~dne+6an~+d|&cSje
> ze4;E}?4NR?Picd7Q5H&mkxe6%1V97n>Dk*4lb!hhG(5K)bw`NqK56qg*55)FXoL;n
> z^rK1)92eRaH|>$!Zg!rcy=4UJ^p}n!-^e`Zn(d?Z`&Aw^+2zeVZ_ur99iC5UFSG2-
> z85MF4gp2SoHU+I+xPn7rV5DzCaY6SS&z=xC0X#4of=kNKXXvh1Beh)~+#AEc{e#0X
> ziaSxw!e9C>^(pA02lxI&!Dsl18=??eYZ@OM?vuR}i~e8H?5bYU9d<d`kNEJ9^7N1T
> z_>cU29j#S{5Uma<=I_Gf&3PVl^~CTXR!HHWRB%HGC~;^}*3G^rnVUgUDq!8uARK$A
> zkhT+uKUs9A-@KM(2oE9#E|}Al_+I)lyUvE0T+*TtMO+aC2@1Jmo)VTelUxv5Z}_KI
> zW3P<OJn1w<-?LmmZqwj@<!f})8)c?yU_GQ)PhQ0X+z&#wgK&?&6HQpk924`Z<jk4?
> zmY011%NQXRB~M)Ta>R*q=B_!6-YVV>BYDAZccUlJPWf`Kfl25@m^dVLvZ5^Zf6l6s
> zff`6}S$opy!Tsn-gH~<bSlS)M0d5lj;kIMA&ht4^w@3v6i@Zr|{LVzzxhUBC4KFAW
> z!8-QdNC1<K1nv3h3P{FI6(E%Jn)Nv_*3AjYPGZbLpL=j>{t5VG)Rg5-1d4{#sLDlX
> zzmVuGqB7<tV-d*QvhEPhyB=wdnfzJ^5<R*Vvhp?ZS&RoBCZl!{(SkZz^opMBsEQ6A
> zywCDvlwe&)9bH<Xt+tbcMuK7~DCV}xo-I1TjcvK<KyRTH4DDG03W4^(Z^{9gH}vcm
> zmjwvG(WVcioH-yZU4m45CsLE`G1?^bY0&C(m`g9KAhpi#!0l<y(y|4J*3mb*s?B@p
> zl;Ga3pZ(au87Q*ANUi*TuKr)i)w|@3?FMu}x^9a|*BB(&mP7vn9<;e2$;q!*tmAJI
> zMzWf^JilmO31yQxP28GgyFgyiZ-wy&n1-gX3S3hL(d4e<05>$&>eY~eDzAsdS|jJu
> zYOt0O3PxOS!}Cx$V(dnPFPaqKVp#r!;F|h+dm$HIxUB$(v!7h0tBva_T@U=m`NBiD
> zbSF2(%S42iF*BsV)|g8c*!CK3_IvuVvk}vdFmz*i4h45_(cqI^iG&{P_}d1nhLvm_
> z4iOVE<`LfOR`*^q#-N)KHiXdn!&{@VKq2B=v+gxiKk@L9UrdC-<SJOc`}&Oo$rR=@
> z2!fCq>>>@$nk+2=c<;{GEkv$cY#9}Cw?hlRw+k`NR9Q<k1-!USu=I+0MRv2&T{>7S
> zfu}qI+^G!0lR6N)XE|9(04wpKf0qMcwpo-wpUyqcnq(_9S8KWq>>{GUq7lM@O!1Gq
> zy7np(r7z-X#9SdWiV{uh5;Mw4becR(Vob;LW(L8oMqRmxZ*6f9wes?|tv;MQZ`ojc
> z<hw=~RSS%O%Z4qmV1?#X5*IcK1p`h3Asc)|EB(Zs!vpyQEn}V+Xx*u~CZH0R4IIjz
> zDm=dPa@N4H!%<{4WO}FGXK!D>e?$AS;npoF;|f(>@ZlYsI7eYeS$?c+E{w=$PRlyT
> zIMnG^O`KVniec=V{no}zd&+BnfqOe!`vm9Yy_D|Xr|}Y$(zf=Ge>pyW_akmJ_vHNi
> z<n*PFpYt;`5>m@%U!E|{BQG`e>lj+4OokCl<iY9>6PJA@lY3=x4TQ9-g#Q-;go6)~
> zGt!a-vRM?rW~3EofNI%Qu_;T`&2icQx#_x{*W+Fs%YGv03?Y1OtHg2M0(5s#tBiNG
> z>WDz0hew^B&6QdhWez*8AYl)f?tMtNX(s2-kI&9_H_Nx1L<tRan5>Ku26wiiU}6@f
> zz{P1JsQlOy2bf%@Q0cV}+mYE>ywiMEsm_9jG49oBui;ig0?{^GC2?q=T!4e-ilJO?
> zcp-Q{G;gd9ORal~Y*(d^6sf+eGW6nANm~NKf_iOsl)%Pa7d7T$keLT{;FWjL8RxlU
> z69|{WT}u02fywT=BVj~P_^me9mqzi6Eop9`jDNS=O4EO*%LXmkmElgsF!k;aDJr1r
> zV+0ol(Q~^MpxKPX0p=y;rNVuz$mb_X(qcEV4Mxl%&@<9qgB0E7uzwPZaiRuY4xwP(
> zq_K5R3l*cV)A-2iY=v?aB+&pv1-C`>id&Ocyb&i?(Me3(s|tlV;ZRH@gyU{tCUIAV
> zyCOV^S-EQ$^R)M>+oV{X45!U6^XV@zs(*pYMsP2)pN8Cbm%g>XGgvdX>Cm_CT*NP4
> zO(KG=VNCP;H^*St<oKAj6CEff4r*rjP;y3YAA^JTfqQbmkif<*3KD;p-LBm&70fs`
> zcq#X_3BO*3UnSe*4+I^;6%YYeV}rwRUp*d+=)6iiSFR^Fu59KynVg?Kmu<sdolMT(
> zp8YL4_~Re%jAQu!0ocaz+bX{ll?qJnHoS|||CCon`~i2uZqR`LyvdHRuGbB?Z*`K*
> z*U+C~fX?E>yLhL=NAX$yC4Q0O#4}vrpQBlwfcHk{(l)MWrBB!3Y34Us9XYjic-RLR
> zQ82dulGgLGTE)Z77yNWo<X^6`#g_#BW{adi4sLY!4m{uqm{m)B>>uz24)22R{34rH
> zYXoc@-nnz<5#Di;#KV^fekiN?QI;i$)Xla@I!o4HMv;@So+DifJXgu+s#?8)M^Ux<
> z7&*mhDGa>GHgNe|^g~x!xx%r>WqdnpN~H2YDeq$`>EIiR13?iF9zk7AtNiC2x7b@E
> zYdrq*V#S}1=GhcFeo|JK{~bB?d{zz4imQ~io3mweGuLyv5EmH4RFB;{5V<l7Lk(Be
> zb-`NucMrhu_9er@3fU{3r`t#Ivl0xs_(R&%&=dYV`@Eq~wva+tj=oWq+((n>e*xk!
> J#~S#D004`l-XQ=0
>
> diff --git a/meta/recipes-extended/man/man/man.7.gz b/meta/recipes-extended/man/man/man.7.gz
> deleted file mode 100644
> index e85af82426507521badb6f5c425896385f469b5a..0000000000000000000000000000000000000000
> GIT binary patch
> literal 0
> HcmV?d00001
>
> literal 6192
> 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
> OO8yVmcsMtKI{*OKZ6#>{
>
> diff --git a/meta/recipes-extended/man/man/man.conf b/meta/recipes-extended/man/man/man.conf
> deleted file mode 100644
> index fc10be2758d..00000000000
> --- a/meta/recipes-extended/man/man/man.conf
> +++ /dev/null
> @@ -1,141 +0,0 @@
> -#
> -# Generated automatically from man.conf.in by the
> -# configure script.
> -#
> -# man.conf from man-1.5p
> -#
> -# For more information about this file, see the man pages man(1)
> -# and man.conf(5).
> -#
> -# This file is read by man to configure the default manpath (also used
> -# when MANPATH contains an empty substring), to find out where the cat
> -# pages corresponding to given man pages should be stored,
> -# and to map each PATH element to a manpath element.
> -# It may also record the pathname of the man binary. [This is unused.]
> -# The format is:
> -#
> -# MANBIN pathname
> -# MANPATH manpath_element [corresponding_catdir]
> -# MANPATH_MAP path_element manpath_element
> -#
> -# If no catdir is given, it is assumed to be equal to the mandir
> -# (so that this dir has both man1 etc. and cat1 etc. subdirs).
> -# This is the traditional Unix setup.
> -# Certain versions of the FSSTND recommend putting formatted versions
> -# of /usr/.../man/manx/page.x into /var/catman/.../catx/page.x.
> -# The keyword FSSTND will cause this behaviour.
> -# Certain versions of the FHS recommend putting formatted versions of
> -# /usr/.../share/man/[locale/]manx/page.x into
> -# /var/cache/man/.../[locale/]catx/page.x.
> -# The keyword FHS will cause this behaviour (and overrides FSSTND).
> -# Explicitly given catdirs override.
> -#
> -# FSSTND
> -FHS
> -#
> -# This file is also read by man in order to find how to call nroff, less, etc.,
> -# and to determine the correspondence between extensions and decompressors.
> -#
> -# MANBIN /usr/local/bin/man
> -#
> -# Every automatically generated MANPATH includes these fields
> -#
> -MANPATH /usr/man
> -MANPATH /usr/share/man
> -MANPATH /usr/local/man
> -MANPATH /usr/local/share/man
> -MANPATH /usr/X11R6/man
> -#
> -# Uncomment if you want to include one of these by default
> -#
> -# MANPATH /opt/*/man
> -# MANPATH /usr/lib/*/man
> -# MANPATH /usr/share/*/man
> -# MANPATH /usr/kerberos/man
> -#
> -# Set up PATH to MANPATH mapping
> -#
> -# If people ask for "man foo" and have "/dir/bin/foo" in their PATH
> -# and the docs are found in "/dir/man", then no mapping is required.
> -#
> -# The below mappings are superfluous when the right hand side is
> -# in the mandatory manpath already, but will keep man from statting
> -# lots of other nearby files and directories.
> -#
> -MANPATH_MAP /bin /usr/share/man
> -MANPATH_MAP /sbin /usr/share/man
> -MANPATH_MAP /usr/bin /usr/share/man
> -MANPATH_MAP /usr/sbin /usr/share/man
> -MANPATH_MAP /usr/local/bin /usr/local/share/man
> -MANPATH_MAP /usr/local/sbin /usr/local/share/man
> -MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man
> -MANPATH_MAP /usr/bin/X11 /usr/X11R6/man
> -MANPATH_MAP /usr/bin/mh /usr/share/man
> -#
> -# NOAUTOPATH keeps man from automatically adding directories that look like
> -# manual page directories to the path.
> -#
> -#NOAUTOPATH
> -#
> -# NOCACHE keeps man from creating cache pages ("cat pages")
> -# (generally one enables/disable cat page creation by creating/deleting
> -# the directory they would live in - man never does mkdir)
> -#
> -#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.
> -# For use with utf-8, NROFF should be "nroff -mandoc" without -T option.
> -# (Maybe - but today I need -Tlatin1 to prevent double conversion to utf8.)
> -#
> -# If you have a new troff (version 1.18.1?) and its colored output
> -# causes problems, add the -c option to TROFF, NROFF, JNROFF.
> -#
> -TROFF /usr/bin/groff -Tps -mandoc
> -NROFF /usr/bin/nroff -Tlatin1 -mandoc
> -JNROFF /usr/bin/groff -Tnippon -mandocj
> -EQN /usr/bin/eqn -Tps
> -NEQN /usr/bin/eqn -Tlatin1
> -JNEQN /usr/bin/eqn -Tnippon
> -TBL /usr/bin/tbl
> -# COL /usr/bin/col
> -REFER /usr/bin/refer
> -PIC /usr/bin/pic
> -VGRIND
> -GRAP
> -PAGER /usr/bin/less -isR
> -CAT /bin/cat
> -#
> -# The command "man -a xyzzy" will show all man pages for xyzzy.
> -# When CMP is defined man will try to avoid showing the same
> -# text twice. (But compressed pages compare unequal.)
> -#
> -CMP /usr/bin/cmp -s
> -#
> -# Compress cat pages
> -#
> -COMPRESS /bin/bzip2
> -COMPRESS_EXT .bz2
> -#
> -# Default manual sections (and order) to search if -S is not specified
> -# and the MANSECT environment variable is not set.
> -#
> -MANSECT 1:1p:8:2:3:3p:4:5:6:7:9:0p:tcl:n:l:p:o
> -#
> -# Default options to use when man is invoked without options
> -# This is mainly for the benefit of those that think -a should be the default
> -# Note that some systems have /usr/man/allman, causing pages to be shown twice.
> -#
> -#MANDEFOPTIONS -a
> -#
> -# Decompress with given decompressor when input file has given extension
> -# The command given must act as a filter.
> -#
> -.gz /bin/gunzip -c
> -.bz2 /usr/bin/bunzip2 -c
> -.xz /usr/bin/unxz -c
> -.z
> -.Z /bin/zcat
> -.F
> -.Y
> diff --git a/meta/recipes-extended/man/man/manpath.5.gz b/meta/recipes-extended/man/man/manpath.5.gz
> deleted file mode 100644
> index c012ff89763bb057afaaaed3b616244748354fec..0000000000000000000000000000000000000000
> GIT binary patch
> literal 0
> HcmV?d00001
>
> literal 2133
> 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
> L!Vpl2a}xjn5ok8&
>
> diff --git a/meta/recipes-extended/man/man_1.6g.bb b/meta/recipes-extended/man/man_1.6g.bb
> deleted file mode 100644
> index ff603f842c1..00000000000
> --- a/meta/recipes-extended/man/man_1.6g.bb
> +++ /dev/null
> @@ -1,86 +0,0 @@
> -SUMMARY = "Online documentation tools"
> -DESCRIPTION = "A set of documentation tools: man, apropos and whatis"
> -SECTION = "console/utils"
> -HOMEPAGE = "http://primates.ximian.com/~flucifredi/man"
> -LICENSE = "GPLv2"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
> -
> -PR = "r1"
> -
> -DEPENDS = "groff less"
> -
> -def compress_pkg(d):
> - if "compress_doc" in (d.getVar("INHERIT") or "").split():
> - compress = d.getVar("DOC_COMPRESS")
> - if compress == "gz":
> - return "gzip"
> - elif compress == "bz2":
> - return "bzip2"
> - elif compress == "xz":
> - return "xz"
> - return ""
> -
> -RDEPENDS_${PN} += "${@compress_pkg(d)}"
> -
> -SRC_URI = "http://pkgs.fedoraproject.org/lookaside/pkgs/man2html/${BP}.tar.gz/ba154d5796928b841c9c69f0ae376660/${BP}.tar.gz \
> - file://man-1.5k-confpath.patch;striplevel=0 \
> - file://man-1.5h1-make.patch \
> - file://man-1.5k-nonascii.patch \
> - file://man-1.6e-security.patch \
> - file://man-1.6e-mandirs.patch \
> - file://man-1.5m2-bug11621.patch \
> - file://man-1.5k-sofix.patch \
> - file://man-1.5m2-buildroot.patch \
> - file://man-1.6e-ro_usr.patch \
> - file://man-1.5i2-newline.patch;striplevel=0 \
> - file://man-1.5j-utf8.patch \
> - file://man-1.5i2-overflow.patch \
> - file://man-1.5j-nocache.patch \
> - file://man-1.5i2-initial.patch \
> - file://man-1.5h1-gencat.patch;striplevel=0 \
> - file://man-1.5g-nonrootbuild.patch \
> - file://man-1.5j-i18n.patch \
> - file://man-1.6e-whatis2.patch \
> - file://man-1.6e-use_i18n_vars_in_a_std_way.patch \
> - file://man-1.5m2-no-color-for-printing.patch \
> - file://man-1.5m2-sigpipe.patch \
> - file://man-1.6e-i18n_whatis.patch \
> - file://man-1.6e-new_sections.patch \
> - file://man.1.gz;unpack=false \
> - file://man.7.gz;unpack=false \
> - file://man.conf \
> - file://manpath.5.gz;unpack=false \
> - file://man-1.6g-whatis3.patch \
> - file://configure_sed.patch \
> - file://man-1.6g-parallel.patch \
> - file://man-1.6g-compile-warnings.patch \
> - file://man-1.6g-configure.patch \
> -"
> -
> -SRC_URI[md5sum] = "ba154d5796928b841c9c69f0ae376660"
> -SRC_URI[sha256sum] = "ccdcb8c3f4e0080923d7e818f0e4a202db26c46415eaef361387c20995b8959f"
> -
> -CFLAGS += "-DSYSV"
> -
> -do_configure () {
> - ${S}/configure -default -confdir /etc +sgid +fhs +lang all
> -}
> -
> -
> -do_install() {
> - oe_runmake install DESTDIR=${D}
> -}
> -
> -do_install_append(){
> - mkdir -p ${D}${sysconfdir}
> - mkdir -p ${D}${datadir}/man/man5
> - mkdir -p ${D}${datadir}/man/man7
> - cp ${WORKDIR}/man.conf ${D}${sysconfdir}/man.config
> - 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/
> -}
> -
> -
> -RDEPENDS_${PN} = "less groff"
> -FILES_${PN} += "${datadir}/locale ${sysconfdir}/man.config"
>
>
>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 07/10] man-db: replace the outdated man implementation
2018-02-21 20:07 ` Burton, Ross
@ 2018-02-21 20:47 ` Burton, Ross
2018-02-21 22:37 ` Burton, Ross
0 siblings, 1 reply; 16+ messages in thread
From: Burton, Ross @ 2018-02-21 20:47 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 95742 bytes --]
Easy fix: remember PN is lib32-man-db in these builds, so use BPN. Fixed
up locally.
Ross
On 21 February 2018 at 20:07, Burton, Ross <ross.burton@intel.com> wrote:
> Fails in multilib:
>
> ERROR: lib32-man-db-2.8.1-r0 do_package_qa: QA Issue: non
> -dev/-dbg/nativesdk- package contains symlink .so: lib32-man-db path
> '/work/x86-pokymllib32-linux/lib32-man-db/2.8.1-r0/
> packages-split/lib32-man-db/usr/lib/man-db/libman.so'
> non -dev/-dbg/nativesdk- package contains symlink .so: lib32-man-db path
> '/work/x86-pokymllib32-linux/lib32-man-db/2.8.1-r0/
> packages-split/lib32-man-db/usr/lib/man-db/libmandb.so' [dev-so]
>
> Ross
>
> On 12 February 2018 at 11:05, Alexander Kanavin <alexander.kanavin@linux.
> intel.com> wrote:
>
>> Until now oe-core has been using a well obsolete implementation of man.
>>
>> Man-db on the other hand is used by all modern Linux distros, is actively
>> maintained, has a standard build system, and does not require 30 patches
>> to build.
>>
>> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
>> ---
>> meta/recipes-extended/man-db/man-db_2.8.1.bb | 41 ++++++
>> meta/recipes-extended/man/man/configure_sed.patch | 32 -----
>> .../man/man/man-1.5g-nonrootbuild.patch | 16 ---
>> .../man/man/man-1.5h1-gencat.patch | 14 --
>> meta/recipes-extended/man/man/man-1.5h1-make.patch | 17 ---
>> .../man/man/man-1.5i2-initial.patch | 19 ---
>> .../man/man/man-1.5i2-newline.patch | 15 --
>> .../man/man/man-1.5i2-overflow.patch | 16 ---
>> meta/recipes-extended/man/man/man-1.5j-i18n.patch | 16 ---
>> .../man/man/man-1.5j-nocache.patch | 16 ---
>> meta/recipes-extended/man/man/man-1.5j-utf8.patch | 61 --------
>> .../man/man/man-1.5k-confpath.patch | 15 --
>> .../man/man/man-1.5k-nonascii.patch | 18 ---
>> meta/recipes-extended/man/man/man-1.5k-sofix.patch | 24 ----
>> .../man/man/man-1.5m2-bug11621.patch | 15 --
>> .../man/man/man-1.5m2-buildroot.patch | 52 -------
>> .../man/man/man-1.5m2-no-color-for-printing.patch | 15 --
>> .../man/man/man-1.5m2-sigpipe.patch | 30 ----
>> .../man/man/man-1.6e-i18n_whatis.patch | 145
>> -------------------
>> .../man/man/man-1.6e-mandirs.patch | 31 ----
>> .../man/man/man-1.6e-new_sections.patch | 15 --
>> .../recipes-extended/man/man/man-1.6e-ro_usr.patch | 33 -----
>> .../man/man/man-1.6e-security.patch | 62 --------
>> .../man/man-1.6e-use_i18n_vars_in_a_std_way.patch | 160
>> ---------------------
>> .../man/man/man-1.6e-whatis2.patch | 59 --------
>> .../man/man/man-1.6g-compile-warnings.patch | 105 --------------
>> .../man/man/man-1.6g-configure.patch | 68 ---------
>> .../man/man/man-1.6g-parallel.patch | 30 ----
>> .../man/man/man-1.6g-whatis3.patch | 20 ---
>> meta/recipes-extended/man/man/man.1.gz | Bin 12323 -> 0
>> bytes
>> meta/recipes-extended/man/man/man.7.gz | Bin 6192 -> 0 bytes
>> meta/recipes-extended/man/man/man.conf | 141
>> ------------------
>> meta/recipes-extended/man/man/manpath.5.gz | Bin 2133 -> 0 bytes
>> meta/recipes-extended/man/man_1.6g.bb | 86 -----------
>> 34 files changed, 41 insertions(+), 1346 deletions(-)
>> create mode 100644 meta/recipes-extended/man-db/man-db_2.8.1.bb
>> delete mode 100644 meta/recipes-extended/man/man/configure_sed.patch
>> delete mode 100644 meta/recipes-extended/man/man/
>> man-1.5g-nonrootbuild.patch
>> delete mode 100644 meta/recipes-extended/man/man/man-1.5h1-gencat.patch
>> delete mode 100644 meta/recipes-extended/man/man/man-1.5h1-make.patch
>> delete mode 100644 meta/recipes-extended/man/man/man-1.5i2-initial.patch
>> delete mode 100644 meta/recipes-extended/man/man/man-1.5i2-newline.patch
>> delete mode 100644 meta/recipes-extended/man/man/
>> man-1.5i2-overflow.patch
>> delete mode 100644 meta/recipes-extended/man/man/man-1.5j-i18n.patch
>> delete mode 100644 meta/recipes-extended/man/man/man-1.5j-nocache.patch
>> delete mode 100644 meta/recipes-extended/man/man/man-1.5j-utf8.patch
>> delete mode 100644 meta/recipes-extended/man/man/man-1.5k-confpath.patch
>> delete mode 100644 meta/recipes-extended/man/man/man-1.5k-nonascii.patch
>> delete mode 100644 meta/recipes-extended/man/man/man-1.5k-sofix.patch
>> delete mode 100644 meta/recipes-extended/man/man/
>> man-1.5m2-bug11621.patch
>> delete mode 100644 meta/recipes-extended/man/man/
>> man-1.5m2-buildroot.patch
>> delete mode 100644 meta/recipes-extended/man/man/
>> man-1.5m2-no-color-for-printing.patch
>> delete mode 100644 meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
>> delete mode 100644 meta/recipes-extended/man/man/
>> man-1.6e-i18n_whatis.patch
>> delete mode 100644 meta/recipes-extended/man/man/man-1.6e-mandirs.patch
>> delete mode 100644 meta/recipes-extended/man/man/
>> man-1.6e-new_sections.patch
>> delete mode 100644 meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
>> delete mode 100644 meta/recipes-extended/man/man/man-1.6e-security.patch
>> delete mode 100644 meta/recipes-extended/man/man/
>> man-1.6e-use_i18n_vars_in_a_std_way.patch
>> delete mode 100644 meta/recipes-extended/man/man/man-1.6e-whatis2.patch
>> delete mode 100644 meta/recipes-extended/man/man/
>> man-1.6g-compile-warnings.patch
>> delete mode 100644 meta/recipes-extended/man/man/
>> man-1.6g-configure.patch
>> delete mode 100644 meta/recipes-extended/man/man/man-1.6g-parallel.patch
>> delete mode 100644 meta/recipes-extended/man/man/man-1.6g-whatis3.patch
>> delete mode 100644 meta/recipes-extended/man/man/man.1.gz
>> delete mode 100644 meta/recipes-extended/man/man/man.7.gz
>> delete mode 100644 meta/recipes-extended/man/man/man.conf
>> delete mode 100644 meta/recipes-extended/man/man/manpath.5.gz
>> delete mode 100644 meta/recipes-extended/man/man_1.6g.bb
>>
>> diff --git a/meta/recipes-extended/man-db/man-db_2.8.1.bb
>> b/meta/recipes-extended/man-db/man-db_2.8.1.bb
>> new file mode 100644
>> index 00000000000..4e633acd09e
>> --- /dev/null
>> +++ b/meta/recipes-extended/man-db/man-db_2.8.1.bb
>> @@ -0,0 +1,41 @@
>> +SUMMARY = "An implementation of the standard Unix documentation system
>> accessed using the man command"
>> +HOMEPAGE = "http://man-db.nongnu.org/"
>> +LICENSE = "LGPLv2.1 & GPLv2"
>> +LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a
>> 6f89e2100d9b6cdffcea4f398e37343 \
>> + file://docs/COPYING;md5=eb723b
>> 61539feef013de476e68b5c50a"
>> +
>> +SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz"
>> +SRC_URI[md5sum] = "51842978e06686286421f9498d1009b7"
>> +SRC_URI[sha256sum] = "a6aec641ca3d9942b054cc0e9c3f0
>> 5cb46a3a992bc0006795755e2fed1357f3e"
>> +
>> +DEPENDS = "libpipeline gdbm groff-native less"
>> +
>> +# | /usr/src/debug/man-db/2.8.0-r0/man-db-2.8.0/src/whatis.c:939:
>> undefined reference to `_nl_msg_cat_cntr'
>> +USE_NLS_libc-musl = "no"
>> +
>> +inherit gettext pkgconfig autotools
>> +
>> +EXTRA_OECONF = "--with-pager=less --disable-cache-owner"
>> +
>> +do_install_append_libc-musl() {
>> + rm -f ${D}${libdir}/charset.alias
>> +}
>> +
>> +FILES_${PN} += "${libdir}/tmpfiles.d"
>> +
>> +FILES_${PN}-dev += "${libdir}/${PN}/libman.so
>> ${libdir}/${PN}/libmandb.so"
>> +
>> +RPROVIDES_${PN} += " man"
>> +
>> +def compress_pkg(d):
>> + if "compress_doc" in (d.getVar("INHERIT") or "").split():
>> + compress = d.getVar("DOC_COMPRESS")
>> + if compress == "gz":
>> + return "gzip"
>> + elif compress == "bz2":
>> + return "bzip2"
>> + elif compress == "xz":
>> + return "xz"
>> + return ""
>> +
>> +RDEPENDS_${PN} += "${@compress_pkg(d)}"
>> diff --git a/meta/recipes-extended/man/man/configure_sed.patch
>> b/meta/recipes-extended/man/man/configure_sed.patch
>> deleted file mode 100644
>> index d49e6831d9a..00000000000
>> --- a/meta/recipes-extended/man/man/configure_sed.patch
>> +++ /dev/null
>> @@ -1,32 +0,0 @@
>> -man: replace ',' with '#'
>> -
>> -Sometimes, the parameters of CC/BUILD_CC contains the ',', which
>> -cause the sed command failed, so replace the ',' with '#'
>> -
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
>> -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
>> ----
>> - configure | 4 ++--
>> - 1 file changed, 2 insertions(+), 2 deletions(-)
>> -
>> -diff --git a/configure b/configure
>> -index 9f62cf9..9a565ae 100755
>> ---- a/configure
>> -+++ b/configure
>> -@@ -1321,9 +1321,9 @@ do
>> - echo "Creating $infile from $infile.in"
>> - sed -e '
>> - s,@version@,$version,
>> --s,@CC@,$CC,
>> -+s#@CC@#$CC#
>> - s,@EXEEXT@,$EXEEXT,
>> --s,@BUILD_CC@,$BUILD_CC,
>> -+s#@BUILD_CC@#$BUILD_CC#
>> - s,@INSTALL@,$INSTALL,
>> - s,@DEFS@,$DEFS,
>> - s,@LIBS@,$LIBS,
>> ---
>> -1.9.1
>> -
>> diff --git a/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
>> b/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
>> deleted file mode 100644
>> index 6f834bd01bd..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
>> +++ /dev/null
>> @@ -1,16 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> -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/man-1.5h1-gencat.patch
>> b/meta/recipes-extended/man/man/man-1.5h1-gencat.patch
>> deleted file mode 100644
>> index 044b14c5099..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.5h1-gencat.patch
>> +++ /dev/null
>> @@ -1,14 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> ---- 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 <stdio.h>
>> - #include <stdlib.h>
>> - #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
>> deleted file mode 100644
>> index 8631eb2c539..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.5h1-make.patch
>> +++ /dev/null
>> @@ -1,17 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> ---- 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/man-1.5i2-initial.patch
>> b/meta/recipes-extended/man/man/man-1.5i2-initial.patch
>> deleted file mode 100644
>> index fe56c0706ca..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.5i2-initial.patch
>> +++ /dev/null
>> @@ -1,19 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> ---- 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/man-1.5i2-newline.patch
>> b/meta/recipes-extended/man/man/man-1.5i2-newline.patch
>> deleted file mode 100644
>> index 611df5d2594..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.5i2-newline.patch
>> +++ /dev/null
>> @@ -1,15 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> ---- 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)<BUFSIZE)
>> - end++; /* note that buf is NUL-terminated */
>> - *end = '\0';
>> -
>> diff --git a/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
>> b/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
>> deleted file mode 100644
>> index 52d2881a893..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
>> +++ /dev/null
>> @@ -1,16 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> ---- man-1.5i2/src/man.c.overflow Mon Jun 25 00:01:45 2001
>> -+++ man-1.5i2/src/man.c Mon Jun 25 00:01:45 2001
>> -@@ -381,6 +381,9 @@
>> - strcat(name, "/");
>> - strcat(name, beg);
>> - }
>> -+ /* If this is too long, bad things have already happened. *
>> -+ * we should quit IMMEDIATELY. */
>> -+ if(strlen(name)>sizeof(ultname)) _exit(1);
>> -
>> - goto again;
>> - }
>> diff --git a/meta/recipes-extended/man/man/man-1.5j-i18n.patch
>> b/meta/recipes-extended/man/man/man-1.5j-i18n.patch
>> deleted file mode 100644
>> index 2ae09c0ea49..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.5j-i18n.patch
>> +++ /dev/null
>> @@ -1,16 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> ---- 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/man-1.5j-nocache.patch
>> b/meta/recipes-extended/man/man/man-1.5j-nocache.patch
>> deleted file mode 100644
>> index 751dddd53b5..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.5j-nocache.patch
>> +++ /dev/null
>> @@ -1,16 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> ---- 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/man-1.5j-utf8.patch
>> b/meta/recipes-extended/man/man/man-1.5j-utf8.patch
>> deleted file mode 100644
>> index 33d3e4c9745..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.5j-utf8.patch
>> +++ /dev/null
>> @@ -1,61 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> ---- 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/man-1.5k-confpath.patch
>> b/meta/recipes-extended/man/man/man-1.5k-confpath.patch
>> deleted file mode 100644
>> index b5746c2df80..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.5k-confpath.patch
>> +++ /dev/null
>> @@ -1,15 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> ---- 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/man-1.5k-nonascii.patch
>> b/meta/recipes-extended/man/man/man-1.5k-nonascii.patch
>> deleted file mode 100644
>> index d662d9b6a70..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.5k-nonascii.patch
>> +++ /dev/null
>> @@ -1,18 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> ---- ./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/man-1.5k-sofix.patch
>> b/meta/recipes-extended/man/man/man-1.5k-sofix.patch
>> deleted file mode 100644
>> index 50b925288ec..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.5k-sofix.patch
>> +++ /dev/null
>> @@ -1,24 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> ---- 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/man-1.5m2-bug11621.patch
>> b/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
>> deleted file mode 100644
>> index 051299906b8..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
>> +++ /dev/null
>> @@ -1,15 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> ---- ./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/man-1.5m2-buildroot.patch
>> b/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
>> deleted file mode 100644
>> index bc97f56b9af..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
>> +++ /dev/null
>> @@ -1,52 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> ---- ./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/man-1.5m2-no-color-for-printing.patch
>> b/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
>> deleted file mode 100644
>> index c85ff1d8c72..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
>> +++ /dev/null
>> @@ -1,15 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> ---- 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/man-1.5m2-sigpipe.patch
>> b/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
>> deleted file mode 100644
>> index 8af78eab7b1..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
>> +++ /dev/null
>> @@ -1,30 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> ---- 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/man-1.6e-i18n_whatis.patch
>> b/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
>> deleted file mode 100644
>> index e321325d63f..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
>> +++ /dev/null
>> @@ -1,145 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> -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|BESCH
>> REIBUNG|\
>> -+ΠΕΡΙΓΡΑΦΗ|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/man-1.6e-mandirs.patch
>> b/meta/recipes-extended/man/man/man-1.6e-mandirs.patch
>> deleted file mode 100644
>> index b240064c980..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.6e-mandirs.patch
>> +++ /dev/null
>> @@ -1,31 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> ---- 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/man-1.6e-new_sections.patch
>> b/meta/recipes-extended/man/man/man-1.6e-new_sections.patch
>> deleted file mode 100644
>> index fb9773c646e..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.6e-new_sections.patch
>> +++ /dev/null
>> @@ -1,15 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> ---- 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/man-1.6e-ro_usr.patch
>> b/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
>> deleted file mode 100644
>> index 1d1cb0c724c..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
>> +++ /dev/null
>> @@ -1,33 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> -Index: man-1.6f/src/makewhatis.sh
>> -===================================================================
>> ---- man-1.6f.orig/src/makewhatis.sh 2010-12-29 13:42:34.000000000
>> -0800
>> -+++ man-1.6f/src/makewhatis.sh 2010-12-29 13:42:35.667428347 -0800
>> -@@ -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
>> diff --git a/meta/recipes-extended/man/man/man-1.6e-security.patch
>> b/meta/recipes-extended/man/man/man-1.6e-security.patch
>> deleted file mode 100644
>> index 312a882f063..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.6e-security.patch
>> +++ /dev/null
>> @@ -1,62 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> -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/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
>> deleted file mode 100644
>> index 568f742100c..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_
>> std_way.patch
>> +++ /dev/null
>> @@ -1,160 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> -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
>> <string.h> */
>> - 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/man-1.6e-whatis2.patch
>> b/meta/recipes-extended/man/man/man-1.6e-whatis2.patch
>> deleted file mode 100644
>> index fc4ed3135dd..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.6e-whatis2.patch
>> +++ /dev/null
>> @@ -1,59 +0,0 @@
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>> -
>> -Index: man-1.6f/src/makewhatis.sh
>> -===================================================================
>> ---- man-1.6f.orig/src/makewhatis.sh 2010-12-29 13:51:45.000000000
>> -0800
>> -+++ man-1.6f/src/makewhatis.sh 2010-12-29 13:59:35.399799412 -0800
>> -@@ -164,10 +164,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
>> -@@ -180,13 +185,7 @@
>> - echo "about to enter $mandir" > /dev/stderr
>> - fi
>> -
>> -- # kludge for Slackware's /usr/man/preformat
>> -- if [ $mandir = /usr/man/preformat ]
>> -- then
>> -- mandir1=/usr/man
>> -- else
>> -- mandir1=$mandir
>> -- fi
>> -+ mandir1=$WHATIS_DIR
>> -
>> - # if $mandir is on a readonly partition, and the whatis file
>> - # is not a symlink, then let's skip trying to update it
>> -@@ -207,11 +206,6 @@
>> - fi
>> - 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
>> -@@ -447,7 +447,6 @@
>> -
>> - chmod 644 ${mandir1}/whatis
>> - rm $TMPFILE
>> -- fi
>> - done
>> - done
>> diff --git a/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch
>> b/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch
>> deleted file mode 100644
>> index 4631d2d0635..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch
>> +++ /dev/null
>> @@ -1,105 +0,0 @@
>> -Fix a build error when building man.config.5 (a remnant of a long
>> -ago previous patch). Optimized the manpages Makefile for parallel
>> -builds. Also, fix compile warnings in a couple other files.
>> -
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Bill Randle <william.c.randle@intel.com>
>> -
>> ---- man-1.6g/man/Makefile.in.orig 2016-03-28 17:31:08.723949180
>> -0700
>> -+++ man-1.6g/man/Makefile.in 2016-03-28 17:46:12.866910386 -0700
>> -@@ -5,6 +5,13 @@
>> - ALL = man.1 whatis.1 apropos.1 man.config.5
>> - MAYBE8 = makewhatis
>> -
>> -+SUBDIRS := $(shell echo @languages@)
>> -+
>> -+.PHONY: subdirs $(SUBDIRS)
>> -+
>> -+man.config.man: man.conf.man
>> -+ @cp $< $@
>> -+
>> - .SUFFIXES: .man .1 .5 .8
>> -
>> - .man.1:
>> -@@ -19,11 +26,11 @@
>> - INSTALL = @INSTALL@ -c -m 644
>> -
>> - # Where to put the manual pages.
>> --mandir = $(DESTDIR)$(PREFIX)@mandir@$(SLANG)
>> -+mandir := $(DESTDIR)$(PREFIX)@mandir@$(SLANG)
>> -
>> - all: $(ALL)
>> - for i in $(MAYBE8); \
>> -- do if test -f $$i.man; then make -f ../Makefile $$i.8;
>> fi; done
>> -+ do if test -f $$i.man; then $(MAKE) -f ../Makefile $$i.8;
>> fi; done
>> -
>> - install: $(ALL)
>> - mkdir -p $(mandir)/man1 $(mandir)/man5 $(mandir)/man8
>> -@@ -38,24 +45,27 @@
>> - rm -f core *.in *.@man1ext@ *.@man5ext@ *.@man8ext@ *~
>> -
>> - spotless:
>> -+ rm -f man.config.man
>> -
>> - subdirs:
>> -- @for i in @languages@; do if test -d $$i; then echo; \
>> -- echo "==== Making the `cat $$i.txt` man pages. ===="; \
>> -- cd $$i; make -f ../Makefile; cd ..; \
>> -- else echo "==== No $$i man pages found. ===="; fi; done
>> -+subdirs: $(SUBDIRS)
>> -+$(SUBDIRS):
>> -+ if test -d $@; then echo; \
>> -+ echo "==== Making the `cat $@.txt` man pages. ===="; \
>> -+ $(MAKE) -C $@ -f ../Makefile all; \
>> -+ else echo "==== No $@ man pages found. ===="; fi
>> -
>> - installsubdirs:
>> - @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; cd ..; \
>> - else echo "==== No $$i man pages found. ===="; fi; done
>> -
>> - cleansubdirs:
>> -- @for i in ??; do cd $$i; make -f ../Makefile clean; cd ..; done
>> -+ @for i in ??; do $(MAKE) -C $$i -f ../Makefile clean; done
>> - rm -f core *~
>> -
>> - spotlesssubdirs:
>> -- for i in ??; do cd $$i; make -f ../Makefile spotless; cd ..; done
>> -+ for i in ??; do $(MAKE) -C $$i -f ../Makefile spotless; done
>> - rm -f Makefile
>> -
>> ---- man-1.6g/src/gripes.c.orig 2006-11-21 11:53:44.000000000 -0800
>> -+++ man-1.6g/src/gripes.c 2016-03-30 16:32:31.601103487 -0700
>> -@@ -7,8 +7,6 @@
>> -
>> - extern char *msg[];
>> -
>> --static char *mantexts = "man"; /* e.g.
>> /usr/lib/locale/%L/man.cat */
>> --
>> - #ifdef NONLS
>> -
>> - static char *
>> -@@ -30,6 +28,8 @@
>> - #include <nl_types.h>
>> - #include "../catopen/catopen.c"
>> -
>> -+static char *mantexts = "man"; /* e.g.
>> /usr/lib/locale/%L/man.cat */
>> -+
>> - nl_catd catfd = (nl_catd) -1;
>> - int cat_is_open = 0;
>> -
>> ---- man-1.6g/src/manfile.c.orig 2005-08-20 16:26:06.000000000
>> -0700
>> -+++ man-1.6g/src/manfile.c 2016-03-29 09:10:21.527841285 -0700
>> -@@ -299,7 +299,7 @@
>> - const char *((*tocat)(const char *man_filename, const char *ext,
>> - int flags))) {
>> - char **sl;
>> -- struct manpage *res;
>> -+ struct manpage *res = 0;
>> -
>> - standards = (flags & (FHS | FSSTND | DO_HP | DO_IRIX));
>> - to_cat_filename = tocat;
>> diff --git a/meta/recipes-extended/man/man/man-1.6g-configure.patch
>> b/meta/recipes-extended/man/man/man-1.6g-configure.patch
>> deleted file mode 100644
>> index 106cc987819..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.6g-configure.patch
>> +++ /dev/null
>> @@ -1,68 +0,0 @@
>> -Use BUILD_CC and target include files for configuration tests.
>> -If cross-compiling, force pathnames for helper programs, since
>> -autodiscovery by the configure script will not work.
>> -
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Bill Randle <william.c.randle at intel.com>
>> -
>> ---- man-1.6g/configure.orig 2016-03-28 17:46:12.734910976 -0700
>> -+++ man-1.6g/configure 2016-03-30 21:47:45.110572908 -0700
>> -@@ -216,7 +216,8 @@
>> - INCLUDEDIR=${INCLUDEDIR-/usr/include}
>> -
>> - rm -f conftest conftest.c
>> --compile="$CC $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1"
>> -+# since we are interested in target feature support, use that sysroot
>> -+compile="$BUILD_CC -isystem/${PKG_CONFIG_SYSROOT_DIR}/usr/include
>> $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1"
>> -
>> - # Check for various header files.
>> -
>> -@@ -455,19 +456,23 @@
>> - fi
>> - 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
>> -- 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
>> -+ if [ $BUILD_CC != $CC ]; then
>> -+ # cross compiling => target fs not available, so force defaults
>> -+ Fgroff=/usr/bin/groff
>> -+ Fnroff=/usr/bin/nroff
>> -+ Fjnroff=/usr/bin/nroff
>> -+ Fgeqn=/usr/bin/eqn
>> -+ Fgneqn=/usr/bin/neqn
>> -+ Fgtbl=/usr/bin/tbl
>> -+ Fcol=/usr/bin/col
>> -+ Fgrefer=/usr/bin/refer
>> -+ Fgpic=/usr/bin/pic
>> -+ Fmore=/bin/more
>> -+ Fless=/usr/bin/less
>> -+ Fcmp=/usr/bin/cmp
>> -+ Fcat=/bin/cat
>> -+ Fgawk=/usr/bin/gawk
>> -+ fi
>> -
>> -
>> - for i in eqn tbl refer pic
>> -@@ -507,8 +512,8 @@
>> - jnroff="$Fjnroff -Tutf8 -mandocj"
>> - fi
>> - eqn="$Fgeqn -Tps"
>> -- neqn="$Fgeqn -Tutf8"
>> -- jneqn="$Fgeqn -Tutf8"
>> -+ neqn="$Fgneqn -Tutf8"
>> -+ jneqn="$Fgneqn -Tutf8"
>> - tbl="$Fgtbl"
>> - col="$Fcol"
>> - vgrind="$Fvgrind"
>> diff --git a/meta/recipes-extended/man/man/man-1.6g-parallel.patch
>> b/meta/recipes-extended/man/man/man-1.6g-parallel.patch
>> deleted file mode 100644
>> index 72a88b898a1..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.6g-parallel.patch
>> +++ /dev/null
>> @@ -1,30 +0,0 @@
>> -The Makefile for man has a rule to create two generated targets with
>> -a program run from the shell. Because the rule was run twice, with
>> -parallel make, the generated files were being overwritten at the same
>> -time they were being compiled. This patch forces the rule to be run
>> -only once.
>> -
>> -Upstream-Status: Pending
>> -
>> -Signed-off-by: Bill Randle <william.c.randle at intel.com>
>> -
>> ---- man-1.6g/src/Makefile.in.orig 2010-12-31 12:28:46.000000000
>> -0800
>> -+++ man-1.6g/src/Makefile.in 2016-03-28 09:09:16.845458798 -0700
>> -@@ -43,8 +43,10 @@
>> - makemsg:
>> - $(BUILD_CC) -o makemsg makemsg.c
>> -
>> --msg.c gripedefs.h: ../msgs/mess.en makemsg
>> -+msg.c gripedefs.h: genfiles-stamp
>> -+genfiles-stamp: ../msgs/mess.en makemsg
>> - ./makemsg ../msgs/mess.en gripedefs.h msg.c
>> -+ touch genfiles-stamp
>> -
>> - # glob.c does not have prototypes
>> - glob.o: glob.c ndir.h
>> -@@ -117,4 +119,4 @@
>> -
>> - spotless: clean
>> - rm -f Makefile config.status paths.h version.h man.conf
>> -- rm -f gripedefs.h msg.c mess.*.cat
>> -+ rm -f gripedefs.h msg.c mess.*.cat genfiles-stamp
>> diff --git a/meta/recipes-extended/man/man/man-1.6g-whatis3.patch
>> b/meta/recipes-extended/man/man/man-1.6g-whatis3.patch
>> deleted file mode 100644
>> index 63344568575..00000000000
>> --- a/meta/recipes-extended/man/man/man-1.6g-whatis3.patch
>> +++ /dev/null
>> @@ -1,20 +0,0 @@
>> -Do not use absolute path for awk while getting the path of awk
>> -when running makewhatis.
>> -This can avoid errors if path of awk changes.
>> -
>> -Upstream-Status: Submitted [man-1.6g]
>> -
>> -Signed-off-by: Jian Liu <jian.liu@windriver.com>
>> -
>> -diff -Nur man-1.6g.orig/src/makewhatis.sh man-1.6g/src/makewhatis.sh
>> ---- man-1.6g.orig/src/makewhatis.sh 2015-02-25 16:13:12.657611419
>> +0800
>> -+++ man-1.6g/src/makewhatis.sh 2015-02-25 16:14:49.334694815 +0800
>> -@@ -67,7 +67,7 @@
>> - # but that leads to problems and bugs.
>> -
>> - # AWK=/usr/bin/gawk
>> --AWK=@awk@
>> -+AWK=`which awk`
>> -
>> - # Find a place for our temporary files. If security is not a concern,
>> use
>> - # TMPFILE=/tmp/whatis$$; TMPFILEDIR=none
>> diff --git a/meta/recipes-extended/man/man/man.1.gz
>> b/meta/recipes-extended/man/man/man.1.gz
>> deleted file mode 100644
>> index c368045153406ab730aad35bfc7ffd91238bd47d..000000000000000000
>> 0000000000000000000000
>> GIT binary patch
>> literal 0
>> HcmV?d00001
>>
>> literal 12323
>> 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
>> J#~S#D004`l-XQ=0
>>
>> diff --git a/meta/recipes-extended/man/man/man.7.gz
>> b/meta/recipes-extended/man/man/man.7.gz
>> deleted file mode 100644
>> index e85af82426507521badb6f5c425896385f469b5a..000000000000000000
>> 0000000000000000000000
>> GIT binary patch
>> literal 0
>> HcmV?d00001
>>
>> literal 6192
>> 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
>> OO8yVmcsMtKI{*OKZ6#>{
>>
>> diff --git a/meta/recipes-extended/man/man/man.conf
>> b/meta/recipes-extended/man/man/man.conf
>> deleted file mode 100644
>> index fc10be2758d..00000000000
>> --- a/meta/recipes-extended/man/man/man.conf
>> +++ /dev/null
>> @@ -1,141 +0,0 @@
>> -#
>> -# Generated automatically from man.conf.in by the
>> -# configure script.
>> -#
>> -# man.conf from man-1.5p
>> -#
>> -# For more information about this file, see the man pages man(1)
>> -# and man.conf(5).
>> -#
>> -# This file is read by man to configure the default manpath (also used
>> -# when MANPATH contains an empty substring), to find out where the cat
>> -# pages corresponding to given man pages should be stored,
>> -# and to map each PATH element to a manpath element.
>> -# It may also record the pathname of the man binary. [This is unused.]
>> -# The format is:
>> -#
>> -# MANBIN pathname
>> -# MANPATH manpath_element [corresponding_catdir]
>> -# MANPATH_MAP path_element manpath_element
>> -#
>> -# If no catdir is given, it is assumed to be equal to the mandir
>> -# (so that this dir has both man1 etc. and cat1 etc. subdirs).
>> -# This is the traditional Unix setup.
>> -# Certain versions of the FSSTND recommend putting formatted versions
>> -# of /usr/.../man/manx/page.x into /var/catman/.../catx/page.x.
>> -# The keyword FSSTND will cause this behaviour.
>> -# Certain versions of the FHS recommend putting formatted versions of
>> -# /usr/.../share/man/[locale/]manx/page.x into
>> -# /var/cache/man/.../[locale/]catx/page.x.
>> -# The keyword FHS will cause this behaviour (and overrides FSSTND).
>> -# Explicitly given catdirs override.
>> -#
>> -# FSSTND
>> -FHS
>> -#
>> -# This file is also read by man in order to find how to call nroff,
>> less, etc.,
>> -# and to determine the correspondence between extensions and
>> decompressors.
>> -#
>> -# MANBIN /usr/local/bin/man
>> -#
>> -# Every automatically generated MANPATH includes these fields
>> -#
>> -MANPATH /usr/man
>> -MANPATH /usr/share/man
>> -MANPATH /usr/local/man
>> -MANPATH /usr/local/share/man
>> -MANPATH /usr/X11R6/man
>> -#
>> -# Uncomment if you want to include one of these by default
>> -#
>> -# MANPATH /opt/*/man
>> -# MANPATH /usr/lib/*/man
>> -# MANPATH /usr/share/*/man
>> -# MANPATH /usr/kerberos/man
>> -#
>> -# Set up PATH to MANPATH mapping
>> -#
>> -# If people ask for "man foo" and have "/dir/bin/foo" in their PATH
>> -# and the docs are found in "/dir/man", then no mapping is required.
>> -#
>> -# The below mappings are superfluous when the right hand side is
>> -# in the mandatory manpath already, but will keep man from statting
>> -# lots of other nearby files and directories.
>> -#
>> -MANPATH_MAP /bin /usr/share/man
>> -MANPATH_MAP /sbin /usr/share/man
>> -MANPATH_MAP /usr/bin /usr/share/man
>> -MANPATH_MAP /usr/sbin /usr/share/man
>> -MANPATH_MAP /usr/local/bin /usr/local/share/man
>> -MANPATH_MAP /usr/local/sbin /usr/local/share/man
>> -MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man
>> -MANPATH_MAP /usr/bin/X11 /usr/X11R6/man
>> -MANPATH_MAP /usr/bin/mh /usr/share/man
>> -#
>> -# NOAUTOPATH keeps man from automatically adding directories that look
>> like
>> -# manual page directories to the path.
>> -#
>> -#NOAUTOPATH
>> -#
>> -# NOCACHE keeps man from creating cache pages ("cat pages")
>> -# (generally one enables/disable cat page creation by creating/deleting
>> -# the directory they would live in - man never does mkdir)
>> -#
>> -#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.
>> -# For use with utf-8, NROFF should be "nroff -mandoc" without -T option.
>> -# (Maybe - but today I need -Tlatin1 to prevent double conversion to
>> utf8.)
>> -#
>> -# If you have a new troff (version 1.18.1?) and its colored output
>> -# causes problems, add the -c option to TROFF, NROFF, JNROFF.
>> -#
>> -TROFF /usr/bin/groff -Tps -mandoc
>> -NROFF /usr/bin/nroff -Tlatin1 -mandoc
>> -JNROFF /usr/bin/groff -Tnippon -mandocj
>> -EQN /usr/bin/eqn -Tps
>> -NEQN /usr/bin/eqn -Tlatin1
>> -JNEQN /usr/bin/eqn -Tnippon
>> -TBL /usr/bin/tbl
>> -# COL /usr/bin/col
>> -REFER /usr/bin/refer
>> -PIC /usr/bin/pic
>> -VGRIND
>> -GRAP
>> -PAGER /usr/bin/less -isR
>> -CAT /bin/cat
>> -#
>> -# The command "man -a xyzzy" will show all man pages for xyzzy.
>> -# When CMP is defined man will try to avoid showing the same
>> -# text twice. (But compressed pages compare unequal.)
>> -#
>> -CMP /usr/bin/cmp -s
>> -#
>> -# Compress cat pages
>> -#
>> -COMPRESS /bin/bzip2
>> -COMPRESS_EXT .bz2
>> -#
>> -# Default manual sections (and order) to search if -S is not specified
>> -# and the MANSECT environment variable is not set.
>> -#
>> -MANSECT 1:1p:8:2:3:3p:4:5:6:7:9:0p:tcl:n:l:p:o
>> -#
>> -# Default options to use when man is invoked without options
>> -# This is mainly for the benefit of those that think -a should be the
>> default
>> -# Note that some systems have /usr/man/allman, causing pages to be shown
>> twice.
>> -#
>> -#MANDEFOPTIONS -a
>> -#
>> -# Decompress with given decompressor when input file has given extension
>> -# The command given must act as a filter.
>> -#
>> -.gz /bin/gunzip -c
>> -.bz2 /usr/bin/bunzip2 -c
>> -.xz /usr/bin/unxz -c
>> -.z
>> -.Z /bin/zcat
>> -.F
>> -.Y
>> diff --git a/meta/recipes-extended/man/man/manpath.5.gz
>> b/meta/recipes-extended/man/man/manpath.5.gz
>> deleted file mode 100644
>> index c012ff89763bb057afaaaed3b616244748354fec..000000000000000000
>> 0000000000000000000000
>> GIT binary patch
>> literal 0
>> HcmV?d00001
>>
>> literal 2133
>> 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
>> L!Vpl2a}xjn5ok8&
>>
>> diff --git a/meta/recipes-extended/man/man_1.6g.bb
>> b/meta/recipes-extended/man/man_1.6g.bb
>> deleted file mode 100644
>> index ff603f842c1..00000000000
>> --- a/meta/recipes-extended/man/man_1.6g.bb
>> +++ /dev/null
>> @@ -1,86 +0,0 @@
>> -SUMMARY = "Online documentation tools"
>> -DESCRIPTION = "A set of documentation tools: man, apropos and whatis"
>> -SECTION = "console/utils"
>> -HOMEPAGE = "http://primates.ximian.com/~flucifredi/man"
>> -LICENSE = "GPLv2"
>> -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
>> -
>> -PR = "r1"
>> -
>> -DEPENDS = "groff less"
>> -
>> -def compress_pkg(d):
>> - if "compress_doc" in (d.getVar("INHERIT") or "").split():
>> - compress = d.getVar("DOC_COMPRESS")
>> - if compress == "gz":
>> - return "gzip"
>> - elif compress == "bz2":
>> - return "bzip2"
>> - elif compress == "xz":
>> - return "xz"
>> - return ""
>> -
>> -RDEPENDS_${PN} += "${@compress_pkg(d)}"
>> -
>> -SRC_URI = "http://pkgs.fedoraproject.org/lookaside/pkgs/man2html/${BP}
>> .tar.gz/ba154d5796928b841c9c69f0ae376660/${BP}.tar.gz \
>> - file://man-1.5k-confpath.patch;striplevel=0 \
>> - file://man-1.5h1-make.patch \
>> - file://man-1.5k-nonascii.patch \
>> - file://man-1.6e-security.patch \
>> - file://man-1.6e-mandirs.patch \
>> - file://man-1.5m2-bug11621.patch \
>> - file://man-1.5k-sofix.patch \
>> - file://man-1.5m2-buildroot.patch \
>> - file://man-1.6e-ro_usr.patch \
>> - file://man-1.5i2-newline.patch;striplevel=0 \
>> - file://man-1.5j-utf8.patch \
>> - file://man-1.5i2-overflow.patch \
>> - file://man-1.5j-nocache.patch \
>> - file://man-1.5i2-initial.patch \
>> - file://man-1.5h1-gencat.patch;striplevel=0 \
>> - file://man-1.5g-nonrootbuild.patch \
>> - file://man-1.5j-i18n.patch \
>> - file://man-1.6e-whatis2.patch \
>> - file://man-1.6e-use_i18n_vars_in_a_std_way.patch \
>> - file://man-1.5m2-no-color-for-printing.patch \
>> - file://man-1.5m2-sigpipe.patch \
>> - file://man-1.6e-i18n_whatis.patch \
>> - file://man-1.6e-new_sections.patch \
>> - file://man.1.gz;unpack=false \
>> - file://man.7.gz;unpack=false \
>> - file://man.conf \
>> - file://manpath.5.gz;unpack=false \
>> - file://man-1.6g-whatis3.patch \
>> - file://configure_sed.patch \
>> - file://man-1.6g-parallel.patch \
>> - file://man-1.6g-compile-warnings.patch \
>> - file://man-1.6g-configure.patch \
>> -"
>> -
>> -SRC_URI[md5sum] = "ba154d5796928b841c9c69f0ae376660"
>> -SRC_URI[sha256sum] = "ccdcb8c3f4e0080923d7e818f0e4a
>> 202db26c46415eaef361387c20995b8959f"
>> -
>> -CFLAGS += "-DSYSV"
>> -
>> -do_configure () {
>> - ${S}/configure -default -confdir /etc +sgid +fhs +lang all
>> -}
>> -
>> -
>> -do_install() {
>> - oe_runmake install DESTDIR=${D}
>> -}
>> -
>> -do_install_append(){
>> - mkdir -p ${D}${sysconfdir}
>> - mkdir -p ${D}${datadir}/man/man5
>> - mkdir -p ${D}${datadir}/man/man7
>> - cp ${WORKDIR}/man.conf ${D}${sysconfdir}/man.config
>> - 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/
>> -}
>> -
>> -
>> -RDEPENDS_${PN} = "less groff"
>> -FILES_${PN} += "${datadir}/locale ${sysconfdir}/man.config"
>> --
>> 2.15.1
>>
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>>
>
[-- Attachment #2: Type: text/html, Size: 116367 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 07/10] man-db: replace the outdated man implementation
2018-02-21 20:47 ` Burton, Ross
@ 2018-02-21 22:37 ` Burton, Ross
0 siblings, 0 replies; 16+ messages in thread
From: Burton, Ross @ 2018-02-21 22:37 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 98412 bytes --]
Also:
ERROR: lib64-man-db-2.8.1-r0 do_package: QA Issue: lib64-man-db:
Files/directories were installed but not shipped in any package:
/usr/lib
/usr/lib/tmpfiles.d
/usr/lib/tmpfiles.d/man-db.conf
tmpfiles.d is ${prefix}/lib/ explicitly in systemd.
Such fun!
Ross
On 21 February 2018 at 20:47, Burton, Ross <ross.burton@intel.com> wrote:
> Easy fix: remember PN is lib32-man-db in these builds, so use BPN. Fixed
> up locally.
>
> Ross
>
> On 21 February 2018 at 20:07, Burton, Ross <ross.burton@intel.com> wrote:
>
>> Fails in multilib:
>>
>> ERROR: lib32-man-db-2.8.1-r0 do_package_qa: QA Issue: non
>> -dev/-dbg/nativesdk- package contains symlink .so: lib32-man-db path
>> '/work/x86-pokymllib32-linux/lib32-man-db/2.8.1-r0/packages-
>> split/lib32-man-db/usr/lib/man-db/libman.so'
>> non -dev/-dbg/nativesdk- package contains symlink .so: lib32-man-db path
>> '/work/x86-pokymllib32-linux/lib32-man-db/2.8.1-r0/packages-
>> split/lib32-man-db/usr/lib/man-db/libmandb.so' [dev-so]
>>
>> Ross
>>
>> On 12 February 2018 at 11:05, Alexander Kanavin <
>> alexander.kanavin@linux.intel.com> wrote:
>>
>>> Until now oe-core has been using a well obsolete implementation of man.
>>>
>>> Man-db on the other hand is used by all modern Linux distros, is actively
>>> maintained, has a standard build system, and does not require 30 patches
>>> to build.
>>>
>>> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
>>> ---
>>> meta/recipes-extended/man-db/man-db_2.8.1.bb | 41 ++++++
>>> meta/recipes-extended/man/man/configure_sed.patch | 32 -----
>>> .../man/man/man-1.5g-nonrootbuild.patch | 16 ---
>>> .../man/man/man-1.5h1-gencat.patch | 14 --
>>> meta/recipes-extended/man/man/man-1.5h1-make.patch | 17 ---
>>> .../man/man/man-1.5i2-initial.patch | 19 ---
>>> .../man/man/man-1.5i2-newline.patch | 15 --
>>> .../man/man/man-1.5i2-overflow.patch | 16 ---
>>> meta/recipes-extended/man/man/man-1.5j-i18n.patch | 16 ---
>>> .../man/man/man-1.5j-nocache.patch | 16 ---
>>> meta/recipes-extended/man/man/man-1.5j-utf8.patch | 61 --------
>>> .../man/man/man-1.5k-confpath.patch | 15 --
>>> .../man/man/man-1.5k-nonascii.patch | 18 ---
>>> meta/recipes-extended/man/man/man-1.5k-sofix.patch | 24 ----
>>> .../man/man/man-1.5m2-bug11621.patch | 15 --
>>> .../man/man/man-1.5m2-buildroot.patch | 52 -------
>>> .../man/man/man-1.5m2-no-color-for-printing.patch | 15 --
>>> .../man/man/man-1.5m2-sigpipe.patch | 30 ----
>>> .../man/man/man-1.6e-i18n_whatis.patch | 145
>>> -------------------
>>> .../man/man/man-1.6e-mandirs.patch | 31 ----
>>> .../man/man/man-1.6e-new_sections.patch | 15 --
>>> .../recipes-extended/man/man/man-1.6e-ro_usr.patch | 33 -----
>>> .../man/man/man-1.6e-security.patch | 62 --------
>>> .../man/man-1.6e-use_i18n_vars_in_a_std_way.patch | 160
>>> ---------------------
>>> .../man/man/man-1.6e-whatis2.patch | 59 --------
>>> .../man/man/man-1.6g-compile-warnings.patch | 105 --------------
>>> .../man/man/man-1.6g-configure.patch | 68 ---------
>>> .../man/man/man-1.6g-parallel.patch | 30 ----
>>> .../man/man/man-1.6g-whatis3.patch | 20 ---
>>> meta/recipes-extended/man/man/man.1.gz | Bin 12323 -> 0
>>> bytes
>>> meta/recipes-extended/man/man/man.7.gz | Bin 6192 -> 0
>>> bytes
>>> meta/recipes-extended/man/man/man.conf | 141
>>> ------------------
>>> meta/recipes-extended/man/man/manpath.5.gz | Bin 2133 -> 0
>>> bytes
>>> meta/recipes-extended/man/man_1.6g.bb | 86 -----------
>>> 34 files changed, 41 insertions(+), 1346 deletions(-)
>>> create mode 100644 meta/recipes-extended/man-db/man-db_2.8.1.bb
>>> delete mode 100644 meta/recipes-extended/man/man/configure_sed.patch
>>> delete mode 100644 meta/recipes-extended/man/man/
>>> man-1.5g-nonrootbuild.patch
>>> delete mode 100644 meta/recipes-extended/man/man/man-1.5h1-gencat.patch
>>> delete mode 100644 meta/recipes-extended/man/man/man-1.5h1-make.patch
>>> delete mode 100644 meta/recipes-extended/man/man/
>>> man-1.5i2-initial.patch
>>> delete mode 100644 meta/recipes-extended/man/man/
>>> man-1.5i2-newline.patch
>>> delete mode 100644 meta/recipes-extended/man/man/
>>> man-1.5i2-overflow.patch
>>> delete mode 100644 meta/recipes-extended/man/man/man-1.5j-i18n.patch
>>> delete mode 100644 meta/recipes-extended/man/man/man-1.5j-nocache.patch
>>> delete mode 100644 meta/recipes-extended/man/man/man-1.5j-utf8.patch
>>> delete mode 100644 meta/recipes-extended/man/man/
>>> man-1.5k-confpath.patch
>>> delete mode 100644 meta/recipes-extended/man/man/
>>> man-1.5k-nonascii.patch
>>> delete mode 100644 meta/recipes-extended/man/man/man-1.5k-sofix.patch
>>> delete mode 100644 meta/recipes-extended/man/man/
>>> man-1.5m2-bug11621.patch
>>> delete mode 100644 meta/recipes-extended/man/man/
>>> man-1.5m2-buildroot.patch
>>> delete mode 100644 meta/recipes-extended/man/man/
>>> man-1.5m2-no-color-for-printing.patch
>>> delete mode 100644 meta/recipes-extended/man/man/
>>> man-1.5m2-sigpipe.patch
>>> delete mode 100644 meta/recipes-extended/man/man/
>>> man-1.6e-i18n_whatis.patch
>>> delete mode 100644 meta/recipes-extended/man/man/man-1.6e-mandirs.patch
>>> delete mode 100644 meta/recipes-extended/man/man/
>>> man-1.6e-new_sections.patch
>>> delete mode 100644 meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
>>> delete mode 100644 meta/recipes-extended/man/man/
>>> man-1.6e-security.patch
>>> delete mode 100644 meta/recipes-extended/man/man/
>>> man-1.6e-use_i18n_vars_in_a_std_way.patch
>>> delete mode 100644 meta/recipes-extended/man/man/man-1.6e-whatis2.patch
>>> delete mode 100644 meta/recipes-extended/man/man/
>>> man-1.6g-compile-warnings.patch
>>> delete mode 100644 meta/recipes-extended/man/man/
>>> man-1.6g-configure.patch
>>> delete mode 100644 meta/recipes-extended/man/man/
>>> man-1.6g-parallel.patch
>>> delete mode 100644 meta/recipes-extended/man/man/man-1.6g-whatis3.patch
>>> delete mode 100644 meta/recipes-extended/man/man/man.1.gz
>>> delete mode 100644 meta/recipes-extended/man/man/man.7.gz
>>> delete mode 100644 meta/recipes-extended/man/man/man.conf
>>> delete mode 100644 meta/recipes-extended/man/man/manpath.5.gz
>>> delete mode 100644 meta/recipes-extended/man/man_1.6g.bb
>>>
>>> diff --git a/meta/recipes-extended/man-db/man-db_2.8.1.bb
>>> b/meta/recipes-extended/man-db/man-db_2.8.1.bb
>>> new file mode 100644
>>> index 00000000000..4e633acd09e
>>> --- /dev/null
>>> +++ b/meta/recipes-extended/man-db/man-db_2.8.1.bb
>>> @@ -0,0 +1,41 @@
>>> +SUMMARY = "An implementation of the standard Unix documentation system
>>> accessed using the man command"
>>> +HOMEPAGE = "http://man-db.nongnu.org/"
>>> +LICENSE = "LGPLv2.1 & GPLv2"
>>> +LIC_FILES_CHKSUM = "file://docs/COPYING.LIB;md5=a
>>> 6f89e2100d9b6cdffcea4f398e37343 \
>>> + file://docs/COPYING;md5=eb723b
>>> 61539feef013de476e68b5c50a"
>>> +
>>> +SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/man-db/man-db-${PV}.tar.xz"
>>> +SRC_URI[md5sum] = "51842978e06686286421f9498d1009b7"
>>> +SRC_URI[sha256sum] = "a6aec641ca3d9942b054cc0e9c3f0
>>> 5cb46a3a992bc0006795755e2fed1357f3e"
>>> +
>>> +DEPENDS = "libpipeline gdbm groff-native less"
>>> +
>>> +# | /usr/src/debug/man-db/2.8.0-r0/man-db-2.8.0/src/whatis.c:939:
>>> undefined reference to `_nl_msg_cat_cntr'
>>> +USE_NLS_libc-musl = "no"
>>> +
>>> +inherit gettext pkgconfig autotools
>>> +
>>> +EXTRA_OECONF = "--with-pager=less --disable-cache-owner"
>>> +
>>> +do_install_append_libc-musl() {
>>> + rm -f ${D}${libdir}/charset.alias
>>> +}
>>> +
>>> +FILES_${PN} += "${libdir}/tmpfiles.d"
>>> +
>>> +FILES_${PN}-dev += "${libdir}/${PN}/libman.so
>>> ${libdir}/${PN}/libmandb.so"
>>> +
>>> +RPROVIDES_${PN} += " man"
>>> +
>>> +def compress_pkg(d):
>>> + if "compress_doc" in (d.getVar("INHERIT") or "").split():
>>> + compress = d.getVar("DOC_COMPRESS")
>>> + if compress == "gz":
>>> + return "gzip"
>>> + elif compress == "bz2":
>>> + return "bzip2"
>>> + elif compress == "xz":
>>> + return "xz"
>>> + return ""
>>> +
>>> +RDEPENDS_${PN} += "${@compress_pkg(d)}"
>>> diff --git a/meta/recipes-extended/man/man/configure_sed.patch
>>> b/meta/recipes-extended/man/man/configure_sed.patch
>>> deleted file mode 100644
>>> index d49e6831d9a..00000000000
>>> --- a/meta/recipes-extended/man/man/configure_sed.patch
>>> +++ /dev/null
>>> @@ -1,32 +0,0 @@
>>> -man: replace ',' with '#'
>>> -
>>> -Sometimes, the parameters of CC/BUILD_CC contains the ',', which
>>> -cause the sed command failed, so replace the ',' with '#'
>>> -
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
>>> -Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
>>> ----
>>> - configure | 4 ++--
>>> - 1 file changed, 2 insertions(+), 2 deletions(-)
>>> -
>>> -diff --git a/configure b/configure
>>> -index 9f62cf9..9a565ae 100755
>>> ---- a/configure
>>> -+++ b/configure
>>> -@@ -1321,9 +1321,9 @@ do
>>> - echo "Creating $infile from $infile.in"
>>> - sed -e '
>>> - s,@version@,$version,
>>> --s,@CC@,$CC,
>>> -+s#@CC@#$CC#
>>> - s,@EXEEXT@,$EXEEXT,
>>> --s,@BUILD_CC@,$BUILD_CC,
>>> -+s#@BUILD_CC@#$BUILD_CC#
>>> - s,@INSTALL@,$INSTALL,
>>> - s,@DEFS@,$DEFS,
>>> - s,@LIBS@,$LIBS,
>>> ---
>>> -1.9.1
>>> -
>>> diff --git a/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
>>> b/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
>>> deleted file mode 100644
>>> index 6f834bd01bd..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.5g-nonrootbuild.patch
>>> +++ /dev/null
>>> @@ -1,16 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> -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/man-1.5h1-gencat.patch
>>> b/meta/recipes-extended/man/man/man-1.5h1-gencat.patch
>>> deleted file mode 100644
>>> index 044b14c5099..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.5h1-gencat.patch
>>> +++ /dev/null
>>> @@ -1,14 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> ---- 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 <stdio.h>
>>> - #include <stdlib.h>
>>> - #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
>>> deleted file mode 100644
>>> index 8631eb2c539..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.5h1-make.patch
>>> +++ /dev/null
>>> @@ -1,17 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> ---- 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/man-1.5i2-initial.patch
>>> b/meta/recipes-extended/man/man/man-1.5i2-initial.patch
>>> deleted file mode 100644
>>> index fe56c0706ca..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.5i2-initial.patch
>>> +++ /dev/null
>>> @@ -1,19 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> ---- 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/man-1.5i2-newline.patch
>>> b/meta/recipes-extended/man/man/man-1.5i2-newline.patch
>>> deleted file mode 100644
>>> index 611df5d2594..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.5i2-newline.patch
>>> +++ /dev/null
>>> @@ -1,15 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> ---- 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)<BUFSIZE)
>>> - end++; /* note that buf is NUL-terminated */
>>> - *end = '\0';
>>> -
>>> diff --git a/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
>>> b/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
>>> deleted file mode 100644
>>> index 52d2881a893..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.5i2-overflow.patch
>>> +++ /dev/null
>>> @@ -1,16 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> ---- man-1.5i2/src/man.c.overflow Mon Jun 25 00:01:45 2001
>>> -+++ man-1.5i2/src/man.c Mon Jun 25 00:01:45 2001
>>> -@@ -381,6 +381,9 @@
>>> - strcat(name, "/");
>>> - strcat(name, beg);
>>> - }
>>> -+ /* If this is too long, bad things have already happened. *
>>> -+ * we should quit IMMEDIATELY. */
>>> -+ if(strlen(name)>sizeof(ultname)) _exit(1);
>>> -
>>> - goto again;
>>> - }
>>> diff --git a/meta/recipes-extended/man/man/man-1.5j-i18n.patch
>>> b/meta/recipes-extended/man/man/man-1.5j-i18n.patch
>>> deleted file mode 100644
>>> index 2ae09c0ea49..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.5j-i18n.patch
>>> +++ /dev/null
>>> @@ -1,16 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> ---- 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/man-1.5j-nocache.patch
>>> b/meta/recipes-extended/man/man/man-1.5j-nocache.patch
>>> deleted file mode 100644
>>> index 751dddd53b5..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.5j-nocache.patch
>>> +++ /dev/null
>>> @@ -1,16 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> ---- 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/man-1.5j-utf8.patch
>>> b/meta/recipes-extended/man/man/man-1.5j-utf8.patch
>>> deleted file mode 100644
>>> index 33d3e4c9745..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.5j-utf8.patch
>>> +++ /dev/null
>>> @@ -1,61 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> ---- 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/man-1.5k-confpath.patch
>>> b/meta/recipes-extended/man/man/man-1.5k-confpath.patch
>>> deleted file mode 100644
>>> index b5746c2df80..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.5k-confpath.patch
>>> +++ /dev/null
>>> @@ -1,15 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> ---- 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/man-1.5k-nonascii.patch
>>> b/meta/recipes-extended/man/man/man-1.5k-nonascii.patch
>>> deleted file mode 100644
>>> index d662d9b6a70..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.5k-nonascii.patch
>>> +++ /dev/null
>>> @@ -1,18 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> ---- ./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/man-1.5k-sofix.patch
>>> b/meta/recipes-extended/man/man/man-1.5k-sofix.patch
>>> deleted file mode 100644
>>> index 50b925288ec..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.5k-sofix.patch
>>> +++ /dev/null
>>> @@ -1,24 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> ---- 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/man-1.5m2-bug11621.patch
>>> b/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
>>> deleted file mode 100644
>>> index 051299906b8..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.5m2-bug11621.patch
>>> +++ /dev/null
>>> @@ -1,15 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> ---- ./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/man-1.5m2-buildroot.patch
>>> b/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
>>> deleted file mode 100644
>>> index bc97f56b9af..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.5m2-buildroot.patch
>>> +++ /dev/null
>>> @@ -1,52 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> ---- ./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/man-1.5m2-no-color-for-printing.patch
>>> b/meta/recipes-extended/man/man/man-1.5m2-no-color-for-printing.patch
>>> deleted file mode 100644
>>> index c85ff1d8c72..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.5m2-no-color-for-print
>>> ing.patch
>>> +++ /dev/null
>>> @@ -1,15 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> ---- 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/man-1.5m2-sigpipe.patch
>>> b/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
>>> deleted file mode 100644
>>> index 8af78eab7b1..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.5m2-sigpipe.patch
>>> +++ /dev/null
>>> @@ -1,30 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> ---- 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/man-1.6e-i18n_whatis.patch
>>> b/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
>>> deleted file mode 100644
>>> index e321325d63f..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.6e-i18n_whatis.patch
>>> +++ /dev/null
>>> @@ -1,145 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> -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|BESCH
>>> REIBUNG|\
>>> -+ΠΕΡΙΓΡΑΦΗ|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/man-1.6e-mandirs.patch
>>> b/meta/recipes-extended/man/man/man-1.6e-mandirs.patch
>>> deleted file mode 100644
>>> index b240064c980..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.6e-mandirs.patch
>>> +++ /dev/null
>>> @@ -1,31 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> ---- 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/man-1.6e-new_sections.patch
>>> b/meta/recipes-extended/man/man/man-1.6e-new_sections.patch
>>> deleted file mode 100644
>>> index fb9773c646e..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.6e-new_sections.patch
>>> +++ /dev/null
>>> @@ -1,15 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> ---- 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/man-1.6e-ro_usr.patch
>>> b/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
>>> deleted file mode 100644
>>> index 1d1cb0c724c..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.6e-ro_usr.patch
>>> +++ /dev/null
>>> @@ -1,33 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> -Index: man-1.6f/src/makewhatis.sh
>>> -===================================================================
>>> ---- man-1.6f.orig/src/makewhatis.sh 2010-12-29 13:42:34.000000000
>>> -0800
>>> -+++ man-1.6f/src/makewhatis.sh 2010-12-29 13:42:35.667428347 -0800
>>> -@@ -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
>>> diff --git a/meta/recipes-extended/man/man/man-1.6e-security.patch
>>> b/meta/recipes-extended/man/man/man-1.6e-security.patch
>>> deleted file mode 100644
>>> index 312a882f063..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.6e-security.patch
>>> +++ /dev/null
>>> @@ -1,62 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> -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/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
>>> deleted file mode 100644
>>> index 568f742100c..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.6e-use_i18n_vars_in_a_
>>> std_way.patch
>>> +++ /dev/null
>>> @@ -1,160 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> -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
>>> <string.h> */
>>> - 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/man-1.6e-whatis2.patch
>>> b/meta/recipes-extended/man/man/man-1.6e-whatis2.patch
>>> deleted file mode 100644
>>> index fc4ed3135dd..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.6e-whatis2.patch
>>> +++ /dev/null
>>> @@ -1,59 +0,0 @@
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Scott Garman <scott.a.garman@intel.com>
>>> -
>>> -Index: man-1.6f/src/makewhatis.sh
>>> -===================================================================
>>> ---- man-1.6f.orig/src/makewhatis.sh 2010-12-29 13:51:45.000000000
>>> -0800
>>> -+++ man-1.6f/src/makewhatis.sh 2010-12-29 13:59:35.399799412 -0800
>>> -@@ -164,10 +164,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
>>> -@@ -180,13 +185,7 @@
>>> - echo "about to enter $mandir" > /dev/stderr
>>> - fi
>>> -
>>> -- # kludge for Slackware's /usr/man/preformat
>>> -- if [ $mandir = /usr/man/preformat ]
>>> -- then
>>> -- mandir1=/usr/man
>>> -- else
>>> -- mandir1=$mandir
>>> -- fi
>>> -+ mandir1=$WHATIS_DIR
>>> -
>>> - # if $mandir is on a readonly partition, and the whatis file
>>> - # is not a symlink, then let's skip trying to update it
>>> -@@ -207,11 +206,6 @@
>>> - fi
>>> - 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
>>> -@@ -447,7 +447,6 @@
>>> -
>>> - chmod 644 ${mandir1}/whatis
>>> - rm $TMPFILE
>>> -- fi
>>> - done
>>> - done
>>> diff --git a/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch
>>> b/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch
>>> deleted file mode 100644
>>> index 4631d2d0635..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.6g-compile-warnings.patch
>>> +++ /dev/null
>>> @@ -1,105 +0,0 @@
>>> -Fix a build error when building man.config.5 (a remnant of a long
>>> -ago previous patch). Optimized the manpages Makefile for parallel
>>> -builds. Also, fix compile warnings in a couple other files.
>>> -
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Bill Randle <william.c.randle@intel.com>
>>> -
>>> ---- man-1.6g/man/Makefile.in.orig 2016-03-28 17:31:08.723949180
>>> -0700
>>> -+++ man-1.6g/man/Makefile.in 2016-03-28 17:46:12.866910386 -0700
>>> -@@ -5,6 +5,13 @@
>>> - ALL = man.1 whatis.1 apropos.1 man.config.5
>>> - MAYBE8 = makewhatis
>>> -
>>> -+SUBDIRS := $(shell echo @languages@)
>>> -+
>>> -+.PHONY: subdirs $(SUBDIRS)
>>> -+
>>> -+man.config.man: man.conf.man
>>> -+ @cp $< $@
>>> -+
>>> - .SUFFIXES: .man .1 .5 .8
>>> -
>>> - .man.1:
>>> -@@ -19,11 +26,11 @@
>>> - INSTALL = @INSTALL@ -c -m 644
>>> -
>>> - # Where to put the manual pages.
>>> --mandir = $(DESTDIR)$(PREFIX)@mandir@$(SLANG)
>>> -+mandir := $(DESTDIR)$(PREFIX)@mandir@$(SLANG)
>>> -
>>> - all: $(ALL)
>>> - for i in $(MAYBE8); \
>>> -- do if test -f $$i.man; then make -f ../Makefile $$i.8;
>>> fi; done
>>> -+ do if test -f $$i.man; then $(MAKE) -f ../Makefile
>>> $$i.8; fi; done
>>> -
>>> - install: $(ALL)
>>> - mkdir -p $(mandir)/man1 $(mandir)/man5 $(mandir)/man8
>>> -@@ -38,24 +45,27 @@
>>> - rm -f core *.in *.@man1ext@ *.@man5ext@ *.@man8ext@ *~
>>> -
>>> - spotless:
>>> -+ rm -f man.config.man
>>> -
>>> - subdirs:
>>> -- @for i in @languages@; do if test -d $$i; then echo; \
>>> -- echo "==== Making the `cat $$i.txt` man pages. ===="; \
>>> -- cd $$i; make -f ../Makefile; cd ..; \
>>> -- else echo "==== No $$i man pages found. ===="; fi; done
>>> -+subdirs: $(SUBDIRS)
>>> -+$(SUBDIRS):
>>> -+ if test -d $@; then echo; \
>>> -+ echo "==== Making the `cat $@.txt` man pages. ===="; \
>>> -+ $(MAKE) -C $@ -f ../Makefile all; \
>>> -+ else echo "==== No $@ man pages found. ===="; fi
>>> -
>>> - installsubdirs:
>>> - @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; cd ..; \
>>> - else echo "==== No $$i man pages found. ===="; fi; done
>>> -
>>> - cleansubdirs:
>>> -- @for i in ??; do cd $$i; make -f ../Makefile clean; cd ..; done
>>> -+ @for i in ??; do $(MAKE) -C $$i -f ../Makefile clean; done
>>> - rm -f core *~
>>> -
>>> - spotlesssubdirs:
>>> -- for i in ??; do cd $$i; make -f ../Makefile spotless; cd ..; done
>>> -+ for i in ??; do $(MAKE) -C $$i -f ../Makefile spotless; done
>>> - rm -f Makefile
>>> -
>>> ---- man-1.6g/src/gripes.c.orig 2006-11-21 11:53:44.000000000 -0800
>>> -+++ man-1.6g/src/gripes.c 2016-03-30 16:32:31.601103487 -0700
>>> -@@ -7,8 +7,6 @@
>>> -
>>> - extern char *msg[];
>>> -
>>> --static char *mantexts = "man"; /* e.g.
>>> /usr/lib/locale/%L/man.cat */
>>> --
>>> - #ifdef NONLS
>>> -
>>> - static char *
>>> -@@ -30,6 +28,8 @@
>>> - #include <nl_types.h>
>>> - #include "../catopen/catopen.c"
>>> -
>>> -+static char *mantexts = "man"; /* e.g.
>>> /usr/lib/locale/%L/man.cat */
>>> -+
>>> - nl_catd catfd = (nl_catd) -1;
>>> - int cat_is_open = 0;
>>> -
>>> ---- man-1.6g/src/manfile.c.orig 2005-08-20 16:26:06.000000000
>>> -0700
>>> -+++ man-1.6g/src/manfile.c 2016-03-29 09:10:21.527841285 -0700
>>> -@@ -299,7 +299,7 @@
>>> - const char *((*tocat)(const char *man_filename, const char *ext,
>>> - int flags))) {
>>> - char **sl;
>>> -- struct manpage *res;
>>> -+ struct manpage *res = 0;
>>> -
>>> - standards = (flags & (FHS | FSSTND | DO_HP | DO_IRIX));
>>> - to_cat_filename = tocat;
>>> diff --git a/meta/recipes-extended/man/man/man-1.6g-configure.patch
>>> b/meta/recipes-extended/man/man/man-1.6g-configure.patch
>>> deleted file mode 100644
>>> index 106cc987819..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.6g-configure.patch
>>> +++ /dev/null
>>> @@ -1,68 +0,0 @@
>>> -Use BUILD_CC and target include files for configuration tests.
>>> -If cross-compiling, force pathnames for helper programs, since
>>> -autodiscovery by the configure script will not work.
>>> -
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Bill Randle <william.c.randle at intel.com>
>>> -
>>> ---- man-1.6g/configure.orig 2016-03-28 17:46:12.734910976 -0700
>>> -+++ man-1.6g/configure 2016-03-30 21:47:45.110572908 -0700
>>> -@@ -216,7 +216,8 @@
>>> - INCLUDEDIR=${INCLUDEDIR-/usr/include}
>>> -
>>> - rm -f conftest conftest.c
>>> --compile="$CC $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1"
>>> -+# since we are interested in target feature support, use that sysroot
>>> -+compile="$BUILD_CC -isystem/${PKG_CONFIG_SYSROOT_DIR}/usr/include
>>> $DEFS conftest.c -o conftest $LIBS >/dev/null 2>&1"
>>> -
>>> - # Check for various header files.
>>> -
>>> -@@ -455,19 +456,23 @@
>>> - fi
>>> - 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
>>> -- 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
>>> -+ if [ $BUILD_CC != $CC ]; then
>>> -+ # cross compiling => target fs not available, so force defaults
>>> -+ Fgroff=/usr/bin/groff
>>> -+ Fnroff=/usr/bin/nroff
>>> -+ Fjnroff=/usr/bin/nroff
>>> -+ Fgeqn=/usr/bin/eqn
>>> -+ Fgneqn=/usr/bin/neqn
>>> -+ Fgtbl=/usr/bin/tbl
>>> -+ Fcol=/usr/bin/col
>>> -+ Fgrefer=/usr/bin/refer
>>> -+ Fgpic=/usr/bin/pic
>>> -+ Fmore=/bin/more
>>> -+ Fless=/usr/bin/less
>>> -+ Fcmp=/usr/bin/cmp
>>> -+ Fcat=/bin/cat
>>> -+ Fgawk=/usr/bin/gawk
>>> -+ fi
>>> -
>>> -
>>> - for i in eqn tbl refer pic
>>> -@@ -507,8 +512,8 @@
>>> - jnroff="$Fjnroff -Tutf8 -mandocj"
>>> - fi
>>> - eqn="$Fgeqn -Tps"
>>> -- neqn="$Fgeqn -Tutf8"
>>> -- jneqn="$Fgeqn -Tutf8"
>>> -+ neqn="$Fgneqn -Tutf8"
>>> -+ jneqn="$Fgneqn -Tutf8"
>>> - tbl="$Fgtbl"
>>> - col="$Fcol"
>>> - vgrind="$Fvgrind"
>>> diff --git a/meta/recipes-extended/man/man/man-1.6g-parallel.patch
>>> b/meta/recipes-extended/man/man/man-1.6g-parallel.patch
>>> deleted file mode 100644
>>> index 72a88b898a1..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.6g-parallel.patch
>>> +++ /dev/null
>>> @@ -1,30 +0,0 @@
>>> -The Makefile for man has a rule to create two generated targets with
>>> -a program run from the shell. Because the rule was run twice, with
>>> -parallel make, the generated files were being overwritten at the same
>>> -time they were being compiled. This patch forces the rule to be run
>>> -only once.
>>> -
>>> -Upstream-Status: Pending
>>> -
>>> -Signed-off-by: Bill Randle <william.c.randle at intel.com>
>>> -
>>> ---- man-1.6g/src/Makefile.in.orig 2010-12-31 12:28:46.000000000
>>> -0800
>>> -+++ man-1.6g/src/Makefile.in 2016-03-28 09:09:16.845458798 -0700
>>> -@@ -43,8 +43,10 @@
>>> - makemsg:
>>> - $(BUILD_CC) -o makemsg makemsg.c
>>> -
>>> --msg.c gripedefs.h: ../msgs/mess.en makemsg
>>> -+msg.c gripedefs.h: genfiles-stamp
>>> -+genfiles-stamp: ../msgs/mess.en makemsg
>>> - ./makemsg ../msgs/mess.en gripedefs.h msg.c
>>> -+ touch genfiles-stamp
>>> -
>>> - # glob.c does not have prototypes
>>> - glob.o: glob.c ndir.h
>>> -@@ -117,4 +119,4 @@
>>> -
>>> - spotless: clean
>>> - rm -f Makefile config.status paths.h version.h man.conf
>>> -- rm -f gripedefs.h msg.c mess.*.cat
>>> -+ rm -f gripedefs.h msg.c mess.*.cat genfiles-stamp
>>> diff --git a/meta/recipes-extended/man/man/man-1.6g-whatis3.patch
>>> b/meta/recipes-extended/man/man/man-1.6g-whatis3.patch
>>> deleted file mode 100644
>>> index 63344568575..00000000000
>>> --- a/meta/recipes-extended/man/man/man-1.6g-whatis3.patch
>>> +++ /dev/null
>>> @@ -1,20 +0,0 @@
>>> -Do not use absolute path for awk while getting the path of awk
>>> -when running makewhatis.
>>> -This can avoid errors if path of awk changes.
>>> -
>>> -Upstream-Status: Submitted [man-1.6g]
>>> -
>>> -Signed-off-by: Jian Liu <jian.liu@windriver.com>
>>> -
>>> -diff -Nur man-1.6g.orig/src/makewhatis.sh man-1.6g/src/makewhatis.sh
>>> ---- man-1.6g.orig/src/makewhatis.sh 2015-02-25 16:13:12.657611419
>>> +0800
>>> -+++ man-1.6g/src/makewhatis.sh 2015-02-25 16:14:49.334694815 +0800
>>> -@@ -67,7 +67,7 @@
>>> - # but that leads to problems and bugs.
>>> -
>>> - # AWK=/usr/bin/gawk
>>> --AWK=@awk@
>>> -+AWK=`which awk`
>>> -
>>> - # Find a place for our temporary files. If security is not a concern,
>>> use
>>> - # TMPFILE=/tmp/whatis$$; TMPFILEDIR=none
>>> diff --git a/meta/recipes-extended/man/man/man.1.gz
>>> b/meta/recipes-extended/man/man/man.1.gz
>>> deleted file mode 100644
>>> index c368045153406ab730aad35bfc7ffd91238bd47d..000000000000000000
>>> 0000000000000000000000
>>> GIT binary patch
>>> literal 0
>>> HcmV?d00001
>>>
>>> literal 12323
>>> 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
>>> J#~S#D004`l-XQ=0
>>>
>>> diff --git a/meta/recipes-extended/man/man/man.7.gz
>>> b/meta/recipes-extended/man/man/man.7.gz
>>> deleted file mode 100644
>>> index e85af82426507521badb6f5c425896385f469b5a..000000000000000000
>>> 0000000000000000000000
>>> GIT binary patch
>>> literal 0
>>> HcmV?d00001
>>>
>>> literal 6192
>>> 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
>>> OO8yVmcsMtKI{*OKZ6#>{
>>>
>>> diff --git a/meta/recipes-extended/man/man/man.conf
>>> b/meta/recipes-extended/man/man/man.conf
>>> deleted file mode 100644
>>> index fc10be2758d..00000000000
>>> --- a/meta/recipes-extended/man/man/man.conf
>>> +++ /dev/null
>>> @@ -1,141 +0,0 @@
>>> -#
>>> -# Generated automatically from man.conf.in by the
>>> -# configure script.
>>> -#
>>> -# man.conf from man-1.5p
>>> -#
>>> -# For more information about this file, see the man pages man(1)
>>> -# and man.conf(5).
>>> -#
>>> -# This file is read by man to configure the default manpath (also used
>>> -# when MANPATH contains an empty substring), to find out where the cat
>>> -# pages corresponding to given man pages should be stored,
>>> -# and to map each PATH element to a manpath element.
>>> -# It may also record the pathname of the man binary. [This is unused.]
>>> -# The format is:
>>> -#
>>> -# MANBIN pathname
>>> -# MANPATH manpath_element [corresponding_catdir]
>>> -# MANPATH_MAP path_element manpath_element
>>> -#
>>> -# If no catdir is given, it is assumed to be equal to the mandir
>>> -# (so that this dir has both man1 etc. and cat1 etc. subdirs).
>>> -# This is the traditional Unix setup.
>>> -# Certain versions of the FSSTND recommend putting formatted versions
>>> -# of /usr/.../man/manx/page.x into /var/catman/.../catx/page.x.
>>> -# The keyword FSSTND will cause this behaviour.
>>> -# Certain versions of the FHS recommend putting formatted versions of
>>> -# /usr/.../share/man/[locale/]manx/page.x into
>>> -# /var/cache/man/.../[locale/]catx/page.x.
>>> -# The keyword FHS will cause this behaviour (and overrides FSSTND).
>>> -# Explicitly given catdirs override.
>>> -#
>>> -# FSSTND
>>> -FHS
>>> -#
>>> -# This file is also read by man in order to find how to call nroff,
>>> less, etc.,
>>> -# and to determine the correspondence between extensions and
>>> decompressors.
>>> -#
>>> -# MANBIN /usr/local/bin/man
>>> -#
>>> -# Every automatically generated MANPATH includes these fields
>>> -#
>>> -MANPATH /usr/man
>>> -MANPATH /usr/share/man
>>> -MANPATH /usr/local/man
>>> -MANPATH /usr/local/share/man
>>> -MANPATH /usr/X11R6/man
>>> -#
>>> -# Uncomment if you want to include one of these by default
>>> -#
>>> -# MANPATH /opt/*/man
>>> -# MANPATH /usr/lib/*/man
>>> -# MANPATH /usr/share/*/man
>>> -# MANPATH /usr/kerberos/man
>>> -#
>>> -# Set up PATH to MANPATH mapping
>>> -#
>>> -# If people ask for "man foo" and have "/dir/bin/foo" in their PATH
>>> -# and the docs are found in "/dir/man", then no mapping is required.
>>> -#
>>> -# The below mappings are superfluous when the right hand side is
>>> -# in the mandatory manpath already, but will keep man from statting
>>> -# lots of other nearby files and directories.
>>> -#
>>> -MANPATH_MAP /bin /usr/share/man
>>> -MANPATH_MAP /sbin /usr/share/man
>>> -MANPATH_MAP /usr/bin /usr/share/man
>>> -MANPATH_MAP /usr/sbin /usr/share/man
>>> -MANPATH_MAP /usr/local/bin /usr/local/share/man
>>> -MANPATH_MAP /usr/local/sbin /usr/local/share/man
>>> -MANPATH_MAP /usr/X11R6/bin /usr/X11R6/man
>>> -MANPATH_MAP /usr/bin/X11 /usr/X11R6/man
>>> -MANPATH_MAP /usr/bin/mh /usr/share/man
>>> -#
>>> -# NOAUTOPATH keeps man from automatically adding directories that look
>>> like
>>> -# manual page directories to the path.
>>> -#
>>> -#NOAUTOPATH
>>> -#
>>> -# NOCACHE keeps man from creating cache pages ("cat pages")
>>> -# (generally one enables/disable cat page creation by creating/deleting
>>> -# the directory they would live in - man never does mkdir)
>>> -#
>>> -#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.
>>> -# For use with utf-8, NROFF should be "nroff -mandoc" without -T option.
>>> -# (Maybe - but today I need -Tlatin1 to prevent double conversion to
>>> utf8.)
>>> -#
>>> -# If you have a new troff (version 1.18.1?) and its colored output
>>> -# causes problems, add the -c option to TROFF, NROFF, JNROFF.
>>> -#
>>> -TROFF /usr/bin/groff -Tps -mandoc
>>> -NROFF /usr/bin/nroff -Tlatin1 -mandoc
>>> -JNROFF /usr/bin/groff -Tnippon -mandocj
>>> -EQN /usr/bin/eqn -Tps
>>> -NEQN /usr/bin/eqn -Tlatin1
>>> -JNEQN /usr/bin/eqn -Tnippon
>>> -TBL /usr/bin/tbl
>>> -# COL /usr/bin/col
>>> -REFER /usr/bin/refer
>>> -PIC /usr/bin/pic
>>> -VGRIND
>>> -GRAP
>>> -PAGER /usr/bin/less -isR
>>> -CAT /bin/cat
>>> -#
>>> -# The command "man -a xyzzy" will show all man pages for xyzzy.
>>> -# When CMP is defined man will try to avoid showing the same
>>> -# text twice. (But compressed pages compare unequal.)
>>> -#
>>> -CMP /usr/bin/cmp -s
>>> -#
>>> -# Compress cat pages
>>> -#
>>> -COMPRESS /bin/bzip2
>>> -COMPRESS_EXT .bz2
>>> -#
>>> -# Default manual sections (and order) to search if -S is not specified
>>> -# and the MANSECT environment variable is not set.
>>> -#
>>> -MANSECT 1:1p:8:2:3:3p:4:5:6:7:9:0p:tcl:n:l:p:o
>>> -#
>>> -# Default options to use when man is invoked without options
>>> -# This is mainly for the benefit of those that think -a should be the
>>> default
>>> -# Note that some systems have /usr/man/allman, causing pages to be
>>> shown twice.
>>> -#
>>> -#MANDEFOPTIONS -a
>>> -#
>>> -# Decompress with given decompressor when input file has given extension
>>> -# The command given must act as a filter.
>>> -#
>>> -.gz /bin/gunzip -c
>>> -.bz2 /usr/bin/bunzip2 -c
>>> -.xz /usr/bin/unxz -c
>>> -.z
>>> -.Z /bin/zcat
>>> -.F
>>> -.Y
>>> diff --git a/meta/recipes-extended/man/man/manpath.5.gz
>>> b/meta/recipes-extended/man/man/manpath.5.gz
>>> deleted file mode 100644
>>> index c012ff89763bb057afaaaed3b616244748354fec..000000000000000000
>>> 0000000000000000000000
>>> GIT binary patch
>>> literal 0
>>> HcmV?d00001
>>>
>>> literal 2133
>>> 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
>>> L!Vpl2a}xjn5ok8&
>>>
>>> diff --git a/meta/recipes-extended/man/man_1.6g.bb
>>> b/meta/recipes-extended/man/man_1.6g.bb
>>> deleted file mode 100644
>>> index ff603f842c1..00000000000
>>> --- a/meta/recipes-extended/man/man_1.6g.bb
>>> +++ /dev/null
>>> @@ -1,86 +0,0 @@
>>> -SUMMARY = "Online documentation tools"
>>> -DESCRIPTION = "A set of documentation tools: man, apropos and whatis"
>>> -SECTION = "console/utils"
>>> -HOMEPAGE = "http://primates.ximian.com/~flucifredi/man"
>>> -LICENSE = "GPLv2"
>>> -LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc84
>>> 2c2336e835926c2166c28b"
>>> -
>>> -PR = "r1"
>>> -
>>> -DEPENDS = "groff less"
>>> -
>>> -def compress_pkg(d):
>>> - if "compress_doc" in (d.getVar("INHERIT") or "").split():
>>> - compress = d.getVar("DOC_COMPRESS")
>>> - if compress == "gz":
>>> - return "gzip"
>>> - elif compress == "bz2":
>>> - return "bzip2"
>>> - elif compress == "xz":
>>> - return "xz"
>>> - return ""
>>> -
>>> -RDEPENDS_${PN} += "${@compress_pkg(d)}"
>>> -
>>> -SRC_URI = "http://pkgs.fedoraproject.org/lookaside/pkgs/man2html/${BP}
>>> .tar.gz/ba154d5796928b841c9c69f0ae376660/${BP}.tar.gz \
>>> - file://man-1.5k-confpath.patch;striplevel=0 \
>>> - file://man-1.5h1-make.patch \
>>> - file://man-1.5k-nonascii.patch \
>>> - file://man-1.6e-security.patch \
>>> - file://man-1.6e-mandirs.patch \
>>> - file://man-1.5m2-bug11621.patch \
>>> - file://man-1.5k-sofix.patch \
>>> - file://man-1.5m2-buildroot.patch \
>>> - file://man-1.6e-ro_usr.patch \
>>> - file://man-1.5i2-newline.patch;striplevel=0 \
>>> - file://man-1.5j-utf8.patch \
>>> - file://man-1.5i2-overflow.patch \
>>> - file://man-1.5j-nocache.patch \
>>> - file://man-1.5i2-initial.patch \
>>> - file://man-1.5h1-gencat.patch;striplevel=0 \
>>> - file://man-1.5g-nonrootbuild.patch \
>>> - file://man-1.5j-i18n.patch \
>>> - file://man-1.6e-whatis2.patch \
>>> - file://man-1.6e-use_i18n_vars_in_a_std_way.patch \
>>> - file://man-1.5m2-no-color-for-printing.patch \
>>> - file://man-1.5m2-sigpipe.patch \
>>> - file://man-1.6e-i18n_whatis.patch \
>>> - file://man-1.6e-new_sections.patch \
>>> - file://man.1.gz;unpack=false \
>>> - file://man.7.gz;unpack=false \
>>> - file://man.conf \
>>> - file://manpath.5.gz;unpack=false \
>>> - file://man-1.6g-whatis3.patch \
>>> - file://configure_sed.patch \
>>> - file://man-1.6g-parallel.patch \
>>> - file://man-1.6g-compile-warnings.patch \
>>> - file://man-1.6g-configure.patch \
>>> -"
>>> -
>>> -SRC_URI[md5sum] = "ba154d5796928b841c9c69f0ae376660"
>>> -SRC_URI[sha256sum] = "ccdcb8c3f4e0080923d7e818f0e4a
>>> 202db26c46415eaef361387c20995b8959f"
>>> -
>>> -CFLAGS += "-DSYSV"
>>> -
>>> -do_configure () {
>>> - ${S}/configure -default -confdir /etc +sgid +fhs +lang all
>>> -}
>>> -
>>> -
>>> -do_install() {
>>> - oe_runmake install DESTDIR=${D}
>>> -}
>>> -
>>> -do_install_append(){
>>> - mkdir -p ${D}${sysconfdir}
>>> - mkdir -p ${D}${datadir}/man/man5
>>> - mkdir -p ${D}${datadir}/man/man7
>>> - cp ${WORKDIR}/man.conf ${D}${sysconfdir}/man.config
>>> - 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/
>>> -}
>>> -
>>> -
>>> -RDEPENDS_${PN} = "less groff"
>>> -FILES_${PN} += "${datadir}/locale ${sysconfdir}/man.config"
>>> --
>>> 2.15.1
>>>
>>>
>>> --
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>>
>>>
>>
>
[-- Attachment #2: Type: text/html, Size: 117346 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 07/10] man-db: replace the outdated man implementation
2018-02-12 11:05 ` [PATCH 07/10] man-db: replace the outdated man implementation Alexander Kanavin
` (2 preceding siblings ...)
2018-02-21 20:43 ` Mark Hatle
@ 2018-02-22 12:49 ` Burton, Ross
3 siblings, 0 replies; 16+ messages in thread
From: Burton, Ross @ 2018-02-22 12:49 UTC (permalink / raw)
To: Alexander Kanavin; +Cc: OE-core
[-- Attachment #1: Type: text/plain, Size: 602 bytes --]
On 12 February 2018 at 11:05, Alexander Kanavin <
alexander.kanavin@linux.intel.com> wrote:
> + if "compress_doc" in (d.getVar("INHERIT") or "").split():
>
This breaks the sstate selftests as the hash code doesn't know what you're
looking for in INHERIT so the entire value of INHERIT has to go into the
hash. By changing this to use bb.utils.contains() the hash can simply
reflect whether the value you're after is present or not.
Yes, this is what the old recipe did, but it also overwrote RDEPENDS later
so this function was never called. :)
(squashed into my branch)
Ross
[-- Attachment #2: Type: text/html, Size: 1026 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2018-02-22 12:50 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-12 11:05 [PATCH 01/10] cryptodev: switch SRC_URI to git Alexander Kanavin
2018-02-12 11:05 ` [PATCH 02/10] devtool: fix upstream version check for devtool-test-local recipe Alexander Kanavin
2018-02-12 11:05 ` [PATCH 03/10] lsbinitscripts: update to 9.79 Alexander Kanavin
2018-02-12 11:05 ` [PATCH 04/10] pax: remove the recipe Alexander Kanavin
2018-02-12 11:05 ` [PATCH 05/10] image-live.bbclass: drop support for compressed ISO images Alexander Kanavin
2018-02-12 11:05 ` [PATCH 06/10] libpipeline: add a recipe Alexander Kanavin
2018-02-12 11:05 ` [PATCH 07/10] man-db: replace the outdated man implementation Alexander Kanavin
2018-02-21 20:07 ` Burton, Ross
2018-02-21 20:47 ` Burton, Ross
2018-02-21 22:37 ` Burton, Ross
2018-02-21 20:22 ` Andre McCurdy
2018-02-21 20:43 ` Mark Hatle
2018-02-22 12:49 ` Burton, Ross
2018-02-12 11:05 ` [PATCH 08/10] oe-selftest: fix tests to reflect man->man-db transition Alexander Kanavin
2018-02-12 11:05 ` [PATCH 09/10] maintainers.inc: add missing entries Alexander Kanavin
2018-02-12 11:05 ` [PATCH 10/10] oe-selftest: add a test for recipes without maintainers Alexander Kanavin
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.