Hello community, here is the log from the commit of package man for openSUSE:Factory checked in at 2012-11-02 07:30:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/man (Old) and /work/SRC/openSUSE:Factory/.man.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "man", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/man/man.changes 2012-10-12 08:13:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.man.new/man.changes 2012-11-02 07:30:59.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Oct 29 12:55:03 UTC 2012 - [email protected] + +- Make shadowed manual pages accessible (bnc#786679) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ man-db-2.6.3-listall.dif ++++++ --- /var/tmp/diff_new_pack.IbEgYf/_old 2012-11-02 07:31:03.000000000 +0100 +++ /var/tmp/diff_new_pack.IbEgYf/_new 2012-11-02 07:31:03.000000000 +0100 @@ -1,6 +1,6 @@ --- src/man.c -+++ src/man.c 2008-11-28 12:12:22.000000000 +0000 -@@ -3712,12 +3712,132 @@ static int locate_page (const char *manp ++++ src/man.c 2012-10-29 13:48:02.134344676 +0100 +@@ -3712,12 +3712,141 @@ static int locate_page (const char *manp return found; } @@ -26,8 +26,9 @@ +#if defined(PROMPT_IF_MULTIPLE_SECTIONS) && (PROMPT_IF_MULTIPLE_SECTIONS > 1) + char reqsect[64] = { 0 }; + ssize_t len = 0; ++ int index = -1; ++ const char *lext; + do { -+ const char *lext; + struct sigaction sa; + int used = 0x2A; + @@ -56,12 +57,12 @@ + lext = NULL; + for (candp = candidates; candp; candp = candp->next) { + const struct mandata *info = candp->source; -+ const char *base = ""; + + if (lext && STREQ(lext, info->ext)) -+ base = "+"; ++ fprintf(stderr, " %c %s (%s+%d)", used, info->name, info->ext, candp->add_index); ++ else ++ fprintf(stderr, " %c %s (%s)", used, info->name, info->ext); + -+ fprintf(stderr, " %c %s (%s%s)", used, info->name, info->ext, base); + if (info->whatis) + fprintf(stderr, "\t%s", info->whatis); + fputc('\n', stderr); @@ -97,6 +98,8 @@ + if ((end = strchr(reqsect, '+'))) { + plain = 1; + *end = '\0'; ++ if (*++end) ++ index = atoi(end); + } + reqsect[len] = '\0'; + len = (ssize_t)strlen(reqsect); @@ -109,6 +112,8 @@ + if (base && !STREQ(base, "/man")) + continue; + } ++ if (index >= 0 && index != candp->add_index) ++ continue; + if ((found = STREQ(reqsect, candp->source->ext))) + break; + } @@ -127,13 +132,17 @@ + if (base && !STREQ(base, "/man")) + continue; + } -+ if (len && !STREQ(reqsect, candp->source->ext)) -+ continue; ++ if (len) { ++ if (!STREQ(reqsect, candp->source->ext)) ++ continue; ++ if (index >= 0 && index != candp->add_index) ++ continue; ++ } +#endif global_manpath = is_global_mandir (candp->path); if (!global_manpath) drop_effective_privs (); -@@ -3739,9 +3859,51 @@ static int display_pages (struct candida +@@ -3739,9 +3868,56 @@ static int display_pages (struct candida regain_effective_privs (); if (found && !findall) @@ -167,13 +176,18 @@ + fputs(_("find all matching manual pages"), stderr); + fputc('\n', stderr); + ++ lext = NULL; + do { + struct mandata *info = candp->source; -+ fprintf(stderr, " %c %s (%s)", used, info->name, info->ext); ++ if (lext && STREQ(lext, info->ext)) ++ fprintf(stderr, " %c %s (%s+%d)", used, info->name, info->ext, candp->add_index); ++ else ++ fprintf(stderr, " %c %s (%s)", used, info->name, info->ext); + if (info->whatis) { + fprintf(stderr, "\t%s", info->whatis); + } + fputc('\n', stderr); ++ lext = info->ext; + used = ' '; + } while ((candp = candp->next)); + fflush(stderr); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
