[man-db/f14] - Resolves: #693458 .so bar.1 no longer works

[Ivana Varekova]

commit d200c24b8932a376ef72b3384a2ff21389923697
Author: Ivana Hutarova Varekova <varekova at redhat.com>
Date:   Fri Jun 17 10:16:24 2011 +0200

    - Resolves: #693458
      .so bar.1 no longer works

 man-db-2.5.9-693458.patch |   51 +++++++++++++++++++++++++++++++++++++++++++++
 man-db.spec               |    9 +++++++-
 2 files changed, 59 insertions(+), 1 deletions(-)
---
diff --git a/man-db-2.5.9-693458.patch b/man-db-2.5.9-693458.patch
new file mode 100644
index 0000000..bcb6d8d
--- /dev/null
+++ b/man-db-2.5.9-693458.patch
@@ -0,0 +1,51 @@
+diff -up man-db-2.5.9/src/ult_src.cpom man-db-2.5.9/src/ult_src.c
+--- man-db-2.5.9/src/ult_src.cpom	2011-06-16 15:48:00.000000000 +0200
++++ man-db-2.5.9/src/ult_src.c	2011-06-17 09:24:57.000000000 +0200
+@@ -196,6 +196,8 @@ const char *ult_src (const char *name, c
+ 		     struct stat *buf, int flags)
+ {
+ 	static char *base;		/* must be static */
++	char *full_path;
++	char *end;
+ 	static short recurse; 		/* must be static */
+ 
+ 	/* initialise the function */
+@@ -311,14 +313,37 @@ const char *ult_src (const char *name, c
+ 				free (base);
+ 				base = appendstr (NULL, path, "/", include,
+ 						  NULL);
+-				free (include);
+ 
+ 				debug ("ult_src: points to %s\n", base);
++				recurse++;
++				ult = ult_src (base, path, NULL, flags);
++				recurse--;
+ 
++				if (ult != NULL)
++					goto found;
++
++				/* link to the man page can be relevant to the directory in
++				 * which the man page containing the link is
++				 */
++				free(base);
++
++				full_path = xstrdup (name);
++				end = strrchr(full_path, '/');
++				if (end == NULL)
++					goto clean;
++				end[0] = '\0';
++				base = appendstr (NULL, full_path, "/", include,
++						  NULL);
++
++				debug ("ult_src: points to %s\n", base);
+ 				recurse++;
+ 				ult = ult_src (base, path, NULL, flags);
+ 				recurse--;
+ 
++clean:
++				free(include);
++				free(full_path);
++found:
+ 				pipeline_wait (decomp);
+ 				pipeline_free (decomp);
+ 				free (decomp_base);
diff --git a/man-db.spec b/man-db.spec
index 2e68b0a..086e377 100644
--- a/man-db.spec
+++ b/man-db.spec
@@ -3,7 +3,7 @@
 Summary: Database cached manual pager suite
 Name: man-db
 Version: 2.5.7
-Release: 7%{?dist}
+Release: 8%{?dist}
 # project man-db  GPLv2+
 # Gnulib part     GPLv3+
 License: GPLv2+ and GPLv3+
@@ -20,6 +20,8 @@ Patch1: man-db-2.5.9-654394.patch
 # Resolves: #658368 - "man full comman path" problem
 # upstream patch
 Patch2: man-db-2.5.9-658368.patch
+# Resolves: #693458 - .so bar.1 no longer works
+Patch3: man-db-2.5.9-693458.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: man < 2.0
 Provides: man-pages-reader
@@ -40,6 +42,7 @@ manual pages.
 %patch0 -p1 -b .sgr
 %patch1 -p1 -b .af
 %patch2 -p1 -b .abrt
+%patch3 -p1 -b .so
 
 %build
 %configure\
@@ -121,6 +124,10 @@ rm -rf $RPM_BUILD_ROOT
 %lang(ja)   %{_datadir}/man/ja/man*/*
 
 %changelog
+* Fri Jun 17 2011 Ivana Hutarova Varekova <varekova at redhat.com> - 2.5.7-8
+- Resolves: #693458
+  .so bar.1 no longer works
+
 * Tue Jan  4 2011 Ivana Hutarova Varekova <varekova at redhat.com> - 2.5.7-7
 - Resolves: #658368 fix "man full comman path" problem
   upstream patch (revision/1276)