From 6bb1b63a01559ec1523e8a131ea2b4675e643eb9701b74d721b2d2b51652645b Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Mon, 16 Nov 2009 14:50:02 +0000
Subject: [PATCH] Accepting request 24423 from Base:System

Copy from Base:System/man based on submit request 24423 from user msmeissn

OBS-URL: https://build.opensuse.org/request/show/24423
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/man?expand=0&rev=32
---
 man-db-2.4.3-firefox.dif  | 10 ++++++----
 man-db-2.4.3-section.dif  | 14 ++++++++------
 man-db-2.5.2-fastpipe.dif | 12 +++++++-----
 man.changes               |  5 +++++
 man.spec                  |  2 +-
 5 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/man-db-2.4.3-firefox.dif b/man-db-2.4.3-firefox.dif
index dc4cf0e..539e12c 100644
--- a/man-db-2.4.3-firefox.dif
+++ b/man-db-2.4.3-firefox.dif
@@ -1,6 +1,8 @@
---- src/man.c
-+++ src/man.c	2007-07-18 14:45:24.091833039 +0200
-@@ -2280,21 +2280,23 @@ static void format_display (pipeline *fo
+Index: src/man.c
+===================================================================
+--- src/man.c.orig
++++ src/man.c
+@@ -2031,21 +2031,23 @@ static void format_display (pipeline *de
  			if (!status)
  				break;
  		}
@@ -27,4 +29,4 @@
 +			       html_pager);
  	} else
  #endif /* TROFF_IS_GROFF */
- 	    if (format_cmd) {
+ 	/* TODO: check format_cmd status too? */
diff --git a/man-db-2.4.3-section.dif b/man-db-2.4.3-section.dif
index fc4cb3f..b05e5d3 100644
--- a/man-db-2.4.3-section.dif
+++ b/man-db-2.4.3-section.dif
@@ -1,6 +1,8 @@
---- src/man.c
-+++ src/man.c	2006-06-13 16:01:19.000000000 +0200
-@@ -1312,7 +1312,7 @@
+Index: src/man.c
+===================================================================
+--- src/man.c.orig
++++ src/man.c
+@@ -1142,7 +1142,7 @@ static inline const char *is_section (co
  {
  	const char **vs;
  
@@ -8,8 +10,8 @@
 +	for (vs = section_list; vs && *vs; vs++) {
  		if (STREQ (*vs, name))
  			return name;
- 		if (strlen (*vs) == 1 && STRNEQ (*vs, name, 1))
-@@ -2714,7 +2714,8 @@
+ 		/* allow e.g. 3perl but disallow 8139too and libfoo */
+@@ -2565,7 +2565,8 @@ static int compare_candidates (const str
  		 * section_list.
  		 */
  		const char **sp;
@@ -19,7 +21,7 @@
  			if (!*(*sp + 1)) {
  				/* No extension */
  				if (!sec_left  && **sp == *(left->ext))
-@@ -3397,7 +3398,7 @@
+@@ -3209,7 +3210,7 @@ static int man (const char *name, int *f
  	} else {
  		const char **sp;
  
diff --git a/man-db-2.5.2-fastpipe.dif b/man-db-2.5.2-fastpipe.dif
index 05ba8aa..e68c53b 100644
--- a/man-db-2.5.2-fastpipe.dif
+++ b/man-db-2.5.2-fastpipe.dif
@@ -1,8 +1,10 @@
---- lib/pipeline.c
-+++ lib/pipeline.c	2008-11-21 11:53:20.554776039 +0100
-@@ -50,6 +50,20 @@
- #include "error.h"
- #include "pipeline.h"
+Index: lib/pipeline.c
+===================================================================
+--- lib/pipeline.c.orig
++++ lib/pipeline.c
+@@ -54,6 +54,20 @@
+ #  include "zio.h"
+ #endif /* HAVE_ZIO */
  
 +#ifdef __linux__
 +#   include <sys/socket.h>
diff --git a/man.changes b/man.changes
index 54b81d6..964632e 100644
--- a/man.changes
+++ b/man.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov  3 19:09:30 UTC 2009 - coolo@novell.com
+
+- updated patches to apply with fuzz=0
+
 -------------------------------------------------------------------
 Tue Sep 22 00:19:11 CEST 2009 - crrodriguez@suse.de
 
diff --git a/man.spec b/man.spec
index af7e48e..cb7b502 100644
--- a/man.spec
+++ b/man.spec
@@ -31,7 +31,7 @@ BuildRequires:  gettext-runtime gettext-tools
 BuildRequires:  gettext gettext-devel
 %endif
 Version:        2.5.2
-Release:        21
+Release:        22
 Summary:        A Program for Displaying man Pages
 License:        GPL v2 or later
 Url:            https://savannah.nongnu.org/projects/man-db