[man-db] Updated to the version 2.6.4
pschiffe
pschiffe at fedoraproject.org
Tue Jun 25 08:19:36 UTC 2013
commit 1d578fe9e07e9a71147cad0042e8da3d1b3062ee
Author: Peter Schiffer <pschiffe at redhat.com>
Date: Tue Jun 25 10:18:29 2013 +0200
Updated to the version 2.6.4
- resolves: #977255
.gitignore | 2 +-
man-db-2.5.9-sgr.patch | 24 ----
man-db-2.6.1-so-links.patch | 84 ------------
man-db-2.6.1-wildcards.patch | 292 ------------------------------------------
man-db-2.6.3-gcc.patch | 14 +--
man-db-2.6.3-valgrind.patch | 91 ++++++--------
man-db.spec | 29 +++--
sources | 2 +-
8 files changed, 59 insertions(+), 479 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9066844..bfc13f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/man-db-2.6.3.tar.xz
+/man-db-2.6.4.tar.xz
diff --git a/man-db-2.6.3-gcc.patch b/man-db-2.6.3-gcc.patch
index 6f1759d..93d60f6 100644
--- a/man-db-2.6.3-gcc.patch
+++ b/man-db-2.6.3-gcc.patch
@@ -13,16 +13,4 @@ diff -up man-db-2.6.3/src/check_mandirs.c.gcc man-db-2.6.3/src/check_mandirs.c
while( (mandir = readdir (dir)) ) {
if (strncmp (mandir->d_name, "man", 3) != 0)
-diff -up man-db-2.6.3/src/descriptions_store.c.gcc man-db-2.6.3/src/descriptions_store.c
---- man-db-2.6.3/src/descriptions_store.c.gcc 2011-04-10 03:02:26.000000000 +0200
-+++ man-db-2.6.3/src/descriptions_store.c 2013-03-18 13:53:03.889580350 +0100
-@@ -71,7 +71,7 @@ void store_descriptions (const struct pa
-
- if (trace) {
- for (i = 0; i < trace->len; ++i)
-- debug ("trace->names[%d] = '%s'\n",
-+ debug ("trace->names[%zu] = '%s'\n",
- i, trace->names[i]);
- }
-
-diff -up man-db-2.6.3/src/man.c.gcc man-db-2.6.3/src/man.c
+
diff --git a/man-db-2.6.3-valgrind.patch b/man-db-2.6.3-valgrind.patch
index bb6a9d2..628a1b8 100644
--- a/man-db-2.6.3-valgrind.patch
+++ b/man-db-2.6.3-valgrind.patch
@@ -1,6 +1,6 @@
-diff -up man-db-2.6.3/lib/encodings.c.valgrind-mem man-db-2.6.3/lib/encodings.c
---- man-db-2.6.3/lib/encodings.c.valgrind-mem 2013-04-05 18:19:01.402892699 +0200
-+++ man-db-2.6.3/lib/encodings.c 2013-04-05 18:19:01.419892450 +0200
+diff -up man-db-2.6.4/lib/encodings.c.valgrind-mem man-db-2.6.4/lib/encodings.c
+--- man-db-2.6.4/lib/encodings.c.valgrind-mem 2013-06-24 18:32:18.598659138 +0200
++++ man-db-2.6.4/lib/encodings.c 2013-06-24 18:32:18.613658959 +0200
@@ -559,6 +559,7 @@ const char *get_locale_charset (void)
/* Restore LC_CTYPE to its value on entry to this function. */
@@ -30,9 +30,9 @@ diff -up man-db-2.6.3/lib/encodings.c.valgrind-mem man-db-2.6.3/lib/encodings.c
fclose (supported);
return locale;
}
-diff -up man-db-2.6.3/src/check_mandirs.c.valgrind-mem man-db-2.6.3/src/check_mandirs.c
---- man-db-2.6.3/src/check_mandirs.c.valgrind-mem 2013-04-05 18:19:01.415892509 +0200
-+++ man-db-2.6.3/src/check_mandirs.c 2013-04-05 18:19:01.420892435 +0200
+diff -up man-db-2.6.4/src/check_mandirs.c.valgrind-mem man-db-2.6.4/src/check_mandirs.c
+--- man-db-2.6.4/src/check_mandirs.c.valgrind-mem 2013-06-24 18:32:18.610658995 +0200
++++ man-db-2.6.4/src/check_mandirs.c 2013-06-24 18:32:18.613658959 +0200
@@ -442,6 +442,7 @@ static int testmandirs (const char *path
if (chdir (path) != 0) {
@@ -63,9 +63,9 @@ diff -up man-db-2.6.3/src/check_mandirs.c.valgrind-mem man-db-2.6.3/src/check_ma
return 0;
}
-diff -up man-db-2.6.3/src/manconv_client.c.valgrind-mem man-db-2.6.3/src/manconv_client.c
---- man-db-2.6.3/src/manconv_client.c.valgrind-mem 2011-01-04 04:04:50.000000000 +0100
-+++ man-db-2.6.3/src/manconv_client.c 2013-04-05 18:40:45.360739910 +0200
+diff -up man-db-2.6.4/src/manconv_client.c.valgrind-mem man-db-2.6.4/src/manconv_client.c
+--- man-db-2.6.4/src/manconv_client.c.valgrind-mem 2011-01-04 04:04:50.000000000 +0100
++++ man-db-2.6.4/src/manconv_client.c 2013-06-24 18:32:18.614658947 +0200
@@ -111,8 +111,10 @@ void add_manconv (pipeline *p, const cha
char *name;
pipecmd *cmd;
@@ -78,9 +78,9 @@ diff -up man-db-2.6.3/src/manconv_client.c.valgrind-mem man-db-2.6.3/src/manconv
/* informational only; no shell quoting concerns */
name = appendstr (NULL, MANCONV, " -f ", NULL);
-diff -up man-db-2.6.3/src/man.c.valgrind-mem man-db-2.6.3/src/man.c
---- man-db-2.6.3/src/man.c.valgrind-mem 2013-04-05 18:19:01.408892611 +0200
-+++ man-db-2.6.3/src/man.c 2013-04-05 18:40:56.233580113 +0200
+diff -up man-db-2.6.4/src/man.c.valgrind-mem man-db-2.6.4/src/man.c
+--- man-db-2.6.4/src/man.c.valgrind-mem 2013-06-24 18:32:18.603659078 +0200
++++ man-db-2.6.4/src/man.c 2013-06-24 18:45:21.537924667 +0200
@@ -188,7 +188,7 @@ static char *manpathlist[MAXDIRS];
/* globals */
int quiet = 1;
@@ -90,16 +90,7 @@ diff -up man-db-2.6.3/src/man.c.valgrind-mem man-db-2.6.3/src/man.c
MYDBM_FILE dbf;
extern const char *extension; /* for globbing.c */
extern char *user_config_file; /* defined in manp.c */
-@@ -207,7 +207,7 @@ static char *internal_locale, *multiple_
- static const char *prompt_string;
- static char *less;
- static const char *std_sections[] = STD_SECTIONS;
--static char *manp;
-+static char *manp = NULL;
- static const char *external;
- static struct hashtable *db_hash = NULL;
-
-@@ -950,7 +950,7 @@ static int local_man_loop (const char *a
+@@ -956,7 +956,7 @@ static int local_man_loop (const char *a
if (directory_on_path (argv_dir)) {
char *argv_base = base_name (argv);
@@ -108,7 +99,7 @@ diff -up man-db-2.6.3/src/man.c.valgrind-mem man-db-2.6.3/src/man.c
char **old_manpathlist, **mp;
debug ("recalculating manpath for executable "
-@@ -962,7 +962,9 @@ static int local_man_loop (const char *a
+@@ -968,7 +968,9 @@ static int local_man_loop (const char *a
"executable\n");
goto executable_out;
}
@@ -119,7 +110,7 @@ diff -up man-db-2.6.3/src/man.c.valgrind-mem man-db-2.6.3/src/man.c
old_manpathlist = XNMALLOC (MAXDIRS, char *);
memcpy (old_manpathlist, manpathlist,
-@@ -1167,14 +1169,21 @@ int main (int argc, char *argv[])
+@@ -1176,14 +1178,21 @@ int main (int argc, char *argv[])
manp = get_manpath ("");
printf ("%s\n", manp);
exit (OK);
@@ -144,7 +135,7 @@ diff -up man-db-2.6.3/src/man.c.valgrind-mem man-db-2.6.3/src/man.c
else
free (get_manpath (NULL));
-@@ -1350,6 +1359,14 @@ int main (int argc, char *argv[])
+@@ -1359,6 +1368,10 @@ int main (int argc, char *argv[])
if (cwd[0])
chdir (cwd);
@@ -152,14 +143,10 @@ diff -up man-db-2.6.3/src/man.c.valgrind-mem man-db-2.6.3/src/man.c
+ free (database);
+ database = NULL;
+ }
-+ if (manp) {
-+ free (manp);
-+ manp = NULL;
-+ }
free_pathlist (manpathlist);
free (cwd);
free (internal_locale);
-@@ -1810,6 +1827,9 @@ static pipeline *make_roff_command (cons
+@@ -1819,6 +1832,9 @@ static pipeline *make_roff_command (cons
pipeline_command (p, cmd);
}
@@ -169,7 +156,7 @@ diff -up man-db-2.6.3/src/man.c.valgrind-mem man-db-2.6.3/src/man.c
free (page_encoding);
return p;
}
-@@ -2327,6 +2347,7 @@ static void format_display (pipeline *de
+@@ -2330,6 +2346,7 @@ static void format_display (pipeline *de
htmldir);
free (htmlfile);
free (htmldir);
@@ -177,7 +164,7 @@ diff -up man-db-2.6.3/src/man.c.valgrind-mem man-db-2.6.3/src/man.c
} else
#endif /* TROFF_IS_GROFF */
/* TODO: check format_cmd status too? */
-@@ -2498,6 +2519,7 @@ static int display (const char *dir, con
+@@ -2501,6 +2518,7 @@ static int display (const char *dir, con
free (name);
free_locale_bits (&bits);
}
@@ -185,7 +172,7 @@ diff -up man-db-2.6.3/src/man.c.valgrind-mem man-db-2.6.3/src/man.c
}
#endif /* TROFF_IS_GROFF */
-@@ -2564,6 +2586,7 @@ static int display (const char *dir, con
+@@ -2567,6 +2585,7 @@ static int display (const char *dir, con
if (prompt && do_prompt (title)) {
pipeline_free (format_cmd);
pipeline_free (decomp);
@@ -193,7 +180,7 @@ diff -up man-db-2.6.3/src/man.c.valgrind-mem man-db-2.6.3/src/man.c
return 0;
}
drop_effective_privs ();
-@@ -2690,6 +2713,7 @@ static int display (const char *dir, con
+@@ -2693,6 +2712,7 @@ static int display (const char *dir, con
if (prompt && do_prompt (title)) {
pipeline_free (format_cmd);
pipeline_free (decomp);
@@ -201,7 +188,7 @@ diff -up man-db-2.6.3/src/man.c.valgrind-mem man-db-2.6.3/src/man.c
if (local_man_file)
return 1;
else
-@@ -2741,6 +2765,8 @@ static int display (const char *dir, con
+@@ -2744,6 +2764,8 @@ static int display (const char *dir, con
}
}
@@ -210,7 +197,7 @@ diff -up man-db-2.6.3/src/man.c.valgrind-mem man-db-2.6.3/src/man.c
pipeline_free (format_cmd);
pipeline_free (decomp);
-@@ -2802,6 +2828,7 @@ static char *find_cat_file (const char *
+@@ -2805,6 +2827,7 @@ static char *find_cat_file (const char *
*tmp = 0;
if (is_directory (cat_dir)) {
debug ("will try cat file %s\n", cat_file);
@@ -218,7 +205,7 @@ diff -up man-db-2.6.3/src/man.c.valgrind-mem man-db-2.6.3/src/man.c
return cat_file;
} else
debug ("cat dir %s does not exist\n", cat_dir);
-@@ -3272,6 +3299,7 @@ static int try_section (const char *path
+@@ -3275,6 +3298,7 @@ static int try_section (const char *path
}
}
@@ -226,7 +213,7 @@ diff -up man-db-2.6.3/src/man.c.valgrind-mem man-db-2.6.3/src/man.c
for (np = names; np && *np; np++) {
struct mandata *info = infoalloc ();
char *info_buffer = filename_info (*np, info, name);
-@@ -3300,8 +3328,15 @@ static int try_section (const char *path
+@@ -3303,8 +3327,15 @@ static int try_section (const char *path
else
info->id = SO_MAN;
@@ -243,7 +230,7 @@ diff -up man-db-2.6.3/src/man.c.valgrind-mem man-db-2.6.3/src/man.c
/* Don't free info and info_buffer here. */
}
-@@ -3319,9 +3354,13 @@ static int display_filesystem (struct ca
+@@ -3322,9 +3353,13 @@ static int display_filesystem (struct ca
char *title = appendstr (NULL, candp->source->name,
"(", candp->source->ext, ")", NULL);
if (candp->cat) {
@@ -259,7 +246,7 @@ diff -up man-db-2.6.3/src/man.c.valgrind-mem man-db-2.6.3/src/man.c
} else {
const char *man_file;
char *cat_file;
-@@ -3344,6 +3383,7 @@ static int display_filesystem (struct ca
+@@ -3347,6 +3382,7 @@ static int display_filesystem (struct ca
free (lang);
lang = NULL;
free (title);
@@ -267,7 +254,7 @@ diff -up man-db-2.6.3/src/man.c.valgrind-mem man-db-2.6.3/src/man.c
return found;
}
-@@ -3571,6 +3611,10 @@ static int try_db (const char *manpath,
+@@ -3574,6 +3610,10 @@ static int try_db (const char *manpath,
/* find out where our db for this manpath should be */
catpath = get_catpath (manpath, global_manpath ? SYSTEM_CAT : USER_CAT);
@@ -278,7 +265,7 @@ diff -up man-db-2.6.3/src/man.c.valgrind-mem man-db-2.6.3/src/man.c
if (catpath) {
database = mkdbname (catpath);
free (catpath);
-@@ -3942,7 +3986,7 @@ static int man (const char *name, int *f
+@@ -3945,7 +3985,7 @@ static int man (const char *name, int *f
for (cand = candidates; cand; cand = candnext) {
candnext = cand->next;
@@ -287,9 +274,9 @@ diff -up man-db-2.6.3/src/man.c.valgrind-mem man-db-2.6.3/src/man.c
}
return *found ? OK : NOT_FOUND;
-diff -up man-db-2.6.3/src/mandb.c.valgrind-mem man-db-2.6.3/src/mandb.c
---- man-db-2.6.3/src/mandb.c.valgrind-mem 2012-02-21 12:15:11.000000000 +0100
-+++ man-db-2.6.3/src/mandb.c 2013-04-05 18:19:01.425892362 +0200
+diff -up man-db-2.6.4/src/mandb.c.valgrind-mem man-db-2.6.4/src/mandb.c
+--- man-db-2.6.4/src/mandb.c.valgrind-mem 2012-02-21 12:15:11.000000000 +0100
++++ man-db-2.6.4/src/mandb.c 2013-06-24 18:32:18.618658899 +0200
@@ -247,7 +247,7 @@ static int xcopy (const char *from, cons
}
@@ -299,9 +286,9 @@ diff -up man-db-2.6.3/src/mandb.c.valgrind-mem man-db-2.6.3/src/mandb.c
size_t in = fread (buf, 1, sizeof (buf), ifp);
if (in > 0) {
if (fwrite (buf, 1, in, ofp) == 0 && ferror (ofp)) {
-diff -up man-db-2.6.3/src/manp.c.valgrind-mem man-db-2.6.3/src/manp.c
---- man-db-2.6.3/src/manp.c.valgrind-mem 2013-04-05 18:19:01.412892553 +0200
-+++ man-db-2.6.3/src/manp.c 2013-04-05 18:19:01.428892318 +0200
+diff -up man-db-2.6.4/src/manp.c.valgrind-mem man-db-2.6.4/src/manp.c
+--- man-db-2.6.4/src/manp.c.valgrind-mem 2013-06-24 18:32:18.608659018 +0200
++++ man-db-2.6.4/src/manp.c 2013-06-24 18:32:18.619658887 +0200
@@ -504,6 +504,7 @@ static char *get_nls_manpath (const char
closedir (mandir);
@@ -318,7 +305,7 @@ diff -up man-db-2.6.3/src/manp.c.valgrind-mem man-db-2.6.3/src/manp.c
/* Always try untranslated pages as a last resort. */
locale_manpath = get_nls_manpath (manpathlist, "C");
-@@ -820,6 +822,11 @@ next:
+@@ -821,6 +823,11 @@ next:
free (buf);
buf = NULL;
}
@@ -330,9 +317,9 @@ diff -up man-db-2.6.3/src/manp.c.valgrind-mem man-db-2.6.3/src/manp.c
}
static void free_config_file (void *unused ATTRIBUTE_UNUSED)
-diff -up man-db-2.6.3/src/whatis.c.valgrind-mem man-db-2.6.3/src/whatis.c
---- man-db-2.6.3/src/whatis.c.valgrind-mem 2012-06-18 12:23:37.000000000 +0200
-+++ man-db-2.6.3/src/whatis.c 2013-04-05 18:19:01.429892304 +0200
+diff -up man-db-2.6.4/src/whatis.c.valgrind-mem man-db-2.6.4/src/whatis.c
+--- man-db-2.6.4/src/whatis.c.valgrind-mem 2012-06-18 12:23:37.000000000 +0200
++++ man-db-2.6.4/src/whatis.c 2013-06-24 18:32:18.620658875 +0200
@@ -501,7 +501,7 @@ static inline int do_whatis_section (con
static int suitable_manpath (const char *manpath, const char *page_dir)
diff --git a/man-db.spec b/man-db.spec
index d0492db..cf050ae 100644
--- a/man-db.spec
+++ b/man-db.spec
@@ -1,10 +1,10 @@
%global cache /var/cache/man
-%global gnulib_ver 20120404-stable
+%global gnulib_ver 20130623
Summary: Tools for searching and reading man pages
Name: man-db
-Version: 2.6.3
-Release: 6%{?dist}
+Version: 2.6.4
+Release: 1%{?dist}
# GPLv2+ .. man-db
# GPLv3+ .. gnulib
License: GPLv2+ and GPLv3+
@@ -15,12 +15,6 @@ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.ta
Source1: man-db.crondaily
Source2: man-db.sysconfig
-# resolves: #655385
-Patch0: man-db-2.5.9-sgr.patch
-# resolves: #677669
-Patch1: man-db-2.6.1-wildcards.patch
-# resolves: #693458
-Patch2: man-db-2.6.1-so-links.patch
# resolves: #657409
Patch3: man-db-2.6.1-locale-fallback.patch
# resolves: #841431
@@ -42,6 +36,7 @@ Provides: bundled(gnulib) = %{gnulib_ver}
Requires: coreutils, grep, groff-base, gzip, less
BuildRequires: gdbm-devel, gettext, groff, less, libpipeline-devel, zlib-devel
+BuildRequires: po4a
%description
The man-db package includes five tools for browsing man-pages:
@@ -53,9 +48,6 @@ manual pages.
%prep
%setup -q
-%patch0 -p1 -b .sgr
-%patch1 -p1 -b .wildcards
-%patch2 -p1 -b .so-links
%patch3 -p1 -b .locale-fallback
%patch4 -p1 -b .invalid-cache
%patch5 -p1 -b .overrides
@@ -131,10 +123,23 @@ install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/man-db
%{_mandir}/man8/accessdb.8*
%{_mandir}/man8/catman.8*
%{_mandir}/man8/mandb.8*
+%lang(da) %{_datadir}/man/da/man*/*
+%lang(de) %{_datadir}/man/de/man*/*
%lang(es) %{_datadir}/man/es/man*/*
+%lang(fr) %{_datadir}/man/fr/man*/*
+%lang(id) %{_datadir}/man/id/man*/*
%lang(it) %{_datadir}/man/it/man*/*
+%lang(ja) %{_datadir}/man/ja/man*/*
+%lang(nl) %{_datadir}/man/nl/man*/*
+%lang(pl) %{_datadir}/man/pl/man*/*
+%lang(ru) %{_datadir}/man/ru/man*/*
+%lang(zh_CN) %{_datadir}/man/zh_CN/man*/*
%changelog
+* Tue Jun 25 2013 Peter Schiffer <pschiffe at redhat.com> - 2.6.4-1
+- resolves: #977255
+ updated to 2.6.4
+
* Mon Apr 8 2013 Peter Schiffer <pschiffe at redhat.com> - 2.6.3-6
- resolves: #948695
fixed double free
diff --git a/sources b/sources
index 6d85f5a..283f4f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a593a095599ae97bcacf8d038659a146 man-db-2.6.3.tar.xz
+66d9274637841a43374744efb83cc716 man-db-2.6.4.tar.xz
More information about the scm-commits
mailing list