[busybox] * Mon Oct 4 2010 Denys Vlasenko <dvlasenk at redhat.com> - 1:1.15.1-10 - add compatibility with man-db

[Denys Vlasenko]

commit 43e5bd9f67d60052b0fb12747a69f70fa4e664dd
Author: Denys Vlasenko <dvlasenk at redhat.com>
Date:   Mon Oct 4 14:32:46 2010 +0200

    * Mon Oct  4 2010 Denys Vlasenko <dvlasenk at redhat.com> - 1:1.15.1-10
    - add compatibility with man-db config file (#639461)

 busybox-1.15.1-man_db.patch |   27 +++++++++++++++++++++++++++
 busybox.spec                |    7 ++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/busybox-1.15.1-man_db.patch b/busybox-1.15.1-man_db.patch
new file mode 100644
index 0000000..ae3f15f
--- /dev/null
+++ b/busybox-1.15.1-man_db.patch
@@ -0,0 +1,27 @@
+index 2d3776c..b356e72 100644
+--- a/miscutils/man.c
++++ b/miscutils/man.c
+@@ -182,16 +182,21 @@ int man_main(int argc UNUSED_PARAM, char **argv)
+ 			pager = "more";
+ 	}
+ 
+-	/* Parse man.conf[ig] */
++	/* Parse man.conf[ig] or man_db.conf */
+ 	/* man version 1.6f uses man.config */
++	/* man-db implementation of man uses man_db.conf */
+ 	parser = config_open2("/etc/man.config", fopen_for_read);
+ 	if (!parser)
+ 		parser = config_open2("/etc/man.conf", fopen_for_read);
++	if (!parser)
++		parser = config_open2("/etc/man_db.conf", fopen_for_read);
+ 
+ 	while (config_read(parser, token, 2, 0, "# \t", PARSE_NORMAL)) {
+ 		if (!token[1])
+ 			continue;
+-		if (strcmp("MANPATH", token[0]) == 0) {
++		if (strcmp("MANDATORY_MANPATH"+10, token[0]) == 0 /* "MANPATH"? */
++		 || strcmp("MANDATORY_MANPATH", token[0]) == 0
++		) {
+ 			char *path = token[1];
+ 			while (*path) {
+ 				char *next_path;
diff --git a/busybox.spec b/busybox.spec
index 826d91e..80bbddd 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -1,7 +1,7 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
 Version: 1.15.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Epoch: 1
 License: GPLv2
 Group: System Environment/Shells
@@ -18,6 +18,7 @@ Patch24: uClibc-0.9.30.1-utmp.patch
 Patch25: busybox-1.15.1-uname.patch
 Patch26: uClibc-0.9.30.1-etc_localtime.patch
 Patch27: busybox-1.15.1-build_system.patch
+Patch28: busybox-1.15.1-man_db.patch
 Obsoletes: busybox-anaconda
 URL: http://www.busybox.net
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +57,7 @@ cat %{SOURCE4} >uClibc-0.9.30.1/.config1
 %patch25 -b .uname -p1
 %patch26 -b .etc_localtime -p1
 %patch27 -b .build_system -p1
+%patch28 -b .man_db -p1
 
 %build
 # create static busybox - the executable is kept as busybox-static
@@ -135,6 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/busybox.petitboot.1.gz
 
 %changelog
+* Mon Oct  4 2010 Denys Vlasenko <dvlasenk at redhat.com> - 1:1.15.1-10
+- add compatibility with man-db config file (#639461)
+
 * Wed Sep 29 2010 jkeating - 1:1.15.1-9
 - Rebuilt for gcc bug 634757