Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package man for openSUSE:Factory checked in at 2021-06-25 15:01:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/man (Old) and /work/SRC/openSUSE:Factory/.man.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "man" Fri Jun 25 15:01:03 2021 rev:86 rq:901432 version:2.9.4 Changes: -------- --- /work/SRC/openSUSE:Factory/man/man.changes 2021-02-07 15:14:32.597420077 +0100 +++ /work/SRC/openSUSE:Factory/.man.new.2625/man.changes 2021-06-25 15:01:24.784157075 +0200 @@ -1,0 +2,59 @@ +Tue May 31 20:59:59 UTC 2021 - Stefan Schubert <sch...@suse.de> + +- Add patch man-db-2.9.4-alternitive.dif + * Supporting ALSO new `alternatives` which has the same tasks as + `update-alternatives` but in a simplier way. + +------------------------------------------------------------------- +Mon May 31 19:07:16 UTC 2021 - Ferdinand Thiessen <r...@fthiessen.de> + +- Update to version 2.9.4: + * Add support for zstd-compressed manual pages + * Recognise Esperanto, Romanian, Tamil, and Ukrainian translations + of the NAME section. + * Fix handling of \- in the right-hand side of a NAME section. + * Treat "\[en]" (etc.) as another synonym for "\-" in NAME sections, + alongside the existing "\(en" (etc.). + * Avoid incorrect markup in man(1) with po4a >= 0.58. + * Fix manual page translation infrastructure to compare po4a + versions with more than two components correctly. + * Fix "man -X75-12" and "man -X100-12" to set the document font + size as well as the device + * Fix incompatibility of "man -X" and friends with the seccomp + sandbox. + * man --recode and manconv now adjust encoding declarations on the + first line of their input to refer to the new encoding. + * There is a new "man-recode" program. Which has an interface + designed for bulk conversion and so can be much faster when + used on a large number of pages. + * Fix comparison of candidate manual pages to correctly handle the + case where the language elements are the same and match the + locale, but the territory elements differ. + * If run with no arguments or only a section, man now suggests + running "man man". + * man now understands the <page>(<section>) form on its command + line, so for example "man 'chmod(2)'" is now the same as + "man 2 chmod". + * manconv now guesses the input encoding based on the file name + if it is not explicitly specified. + * Further workarounds for ESET File Security: allow sendmsg when + it is in use. + * If more than one of "../man", "man", "../share/man", and + "share/man" exist relative to a directory on $PATH, then all of + them are now added to the automatically-determined manpath + * Remove arbitrary limit on manpath size. + * Fix several resource and memory leaks. + * Ship a systemd timer to perform daily database maintenance. + * Fix segfaults in mandb. +- Drop our systemd timer in favor of upstream provided one +- Drop unused mancoding +- Drop upstream fixed man-db-2.6.3-section.dif +- Merge man-MAN_POSIXLY_CORRECT-man1.dif into + man-db-2.6.3-listall.dif as first one is only the documentation + of the latter one +- Seperate man-db-2.9.4-no-chown.patch from man-db-2.8.4.dif +- Update man-db-2.8.4.dif, now called man-db-2.9.4.patch +- Update man-db-2.6.3-man0.dif to be used inside prep section +- Refresh man-db-2.7.1-security4.dif, man-db-2.7.1-zio.dif + +------------------------------------------------------------------- Old: ---- man-MAN_POSIXLY_CORRECT-man1.dif man-db-2.6.3-section.dif man-db-2.8.4.dif man-db-2.8.4.tar.xz man-db-2.8.4.tar.xz.asc mancoding mandb.service mandb.timer New: ---- man-db-2.9.4-alternitive.dif man-db-2.9.4-no-chown.patch man-db-2.9.4.patch man-db-2.9.4.tar.xz man-db-2.9.4.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ man.spec ++++++ --- /var/tmp/diff_new_pack.OfZKH1/_old 2021-06-25 15:01:25.580158046 +0200 +++ /var/tmp/diff_new_pack.OfZKH1/_new 2021-06-25 15:01:25.584158051 +0200 @@ -24,36 +24,37 @@ %endif %bcond_without sdtimer Name: man -Version: 2.8.4 +Version: 2.9.4 Release: 0 Summary: A Program for Displaying man Pages License: GPL-2.0-or-later Group: System/Base URL: https://savannah.nongnu.org/projects/man-db -Source: http://download.savannah.gnu.org/releases/man-db/man-db-%{version}.tar.xz -Source1: sysconfig.cron-man -Source2: cron.daily.do_mandb -Source4: mancoding +Source0: https://download.savannah.gnu.org/releases/man-db/man-db-%{version}.tar.xz +Source1: http://download.savannah.gnu.org/releases/man-db/man-db-%{version}.tar.xz.asc +Source2: https://savannah.nongnu.org/project/memberlist-gpgkeys.php?group=man-db&download=1#/%{name}.keyring +Source3: sysconfig.cron-man +Source4: cron.daily.do_mandb Source5: wrapper.c Source6: man-rpmlintrc Source7: man-db-create.service -Source8: mandb.timer -Source9: mandb.service -Source10: man-db-2.6.3-man0.dif -Source11: http://download.savannah.gnu.org/releases/man-db/man-db-%{version}.tar.xz.asc -Source12: https://savannah.nongnu.org/project/memberlist-gpgkeys.php?group=man-db&download=1#/%{name}.keyring -Patch0: man-db-2.8.4.dif -Patch2: man-db-2.3.19deb4.0-groff.dif -Patch4: man-db-2.6.3-section.dif -Patch5: man-db-2.7.1-security4.dif -Patch6: man-db-2.7.1-firefox.dif -Patch7: man-db-2.6.3-chinese.dif -Patch9: man-db-2.7.1-zio.dif -Patch10: man-db-2.6.3-listall.dif -# PATCH-FIX-SUSE Fixes the documentation for bnc#786679 -Patch11: man-MAN_POSIXLY_CORRECT-man1.dif +Patch0: man-db-2.3.19deb4.0-groff.dif +Patch1: man-db-2.7.1-security4.dif +Patch2: man-db-2.7.1-firefox.dif +Patch3: man-db-2.6.3-chinese.dif +# PATCH-FEATURE-OPENSUSE man-db-2.7.1-zio.dif -- Allow using libzio for decompression +Patch4: man-db-2.7.1-zio.dif +# PATCH-FEATURE-OPENSUSE man-db-2.6.3-listall.dif -- If multiple matching pages are found show a list bnc#786679 +Patch5: man-db-2.6.3-listall.dif # PATCH-FIX-SUSE Fixes build-compare bnc#971922 -Patch12: reproducible.patch +Patch6: reproducible.patch +# PATCH-FIX-OPENSUSE man-db-2.9.4-no-chown.patch -- chown is not allowed as non-root +Patch7: man-db-2.9.4-no-chown.patch +# what is it good for? +Patch8: man-db-2.9.4.patch +# PATCH-FEATURE-OPENSUSE -- Add documentation about man0 section (header files) +Patch9: man-db-2.6.3-man0.dif +Patch10: man-db-2.9.4-alternitive.dif BuildRequires: automake BuildRequires: flex BuildRequires: gdbm-devel @@ -61,26 +62,27 @@ BuildRequires: gettext-tools BuildRequires: groff BuildRequires: less -BuildRequires: libbz2-devel +BuildRequires: libalternatives-devel BuildRequires: libpipeline-devel >= 1.5.0 BuildRequires: libzio-devel BuildRequires: man-pages BuildRequires: pkgconfig BuildRequires: po4a BuildRequires: update-alternatives -BuildRequires: xz-devel BuildRequires: zlib-devel +BuildRequires: zstd BuildRequires: pkgconfig(systemd) Requires: glibc-locale-base Suggests: glibc-locale Requires: groff >= 1.18 Requires: less +Requires: libalternatives1 # FIXME: use proper Requires(pre/post/preun/...) PreReq: coreutils PreReq: fillup Requires(post): update-alternatives -Requires(posttrans): systemd -Requires(postun): update-alternatives +Requires(posttrans):systemd +Requires(postun):update-alternatives Requires(pre): group(man) Requires(pre): user(man) Provides: man_db @@ -94,20 +96,24 @@ %prep %setup -q -n man-db-%{version} -%patch2 -b .groff -%patch4 -b .sect -%patch5 -b .secu4 -%patch6 -b .firefox -%patch7 -b .chinese -%patch9 -b .zio -%patch10 -b .listall -%patch11 -b .p11 -%patch12 -p1 -b .p12 -%patch0 -b .0 +%patch0 -b .groff +%patch1 -b .secu4 +%patch2 -b .firefox +%patch3 -b .chinese +%patch4 -b .zio +%patch5 -b .listall +%patch6 -p1 -b .p12 +%patch7 -p1 +%patch8 -p1 +%patch9 -b .s10 +%patch10 -b .libalernative +rm -f configure %build - gettextize --force --copy --no-changelog - SEC=(0 1 n l 8 3 2 5 4 9 6 7 +%global optflags %{optflags} -funroll-loops -pipe -Wall + +gettextize --force --copy --no-changelog +SEC=(0 1 n l 8 3 2 5 4 9 6 7 1x 3x 4x 5x 6x 8x 1bind 3bind 5bind 7bind 8bind 1cn 8cn @@ -126,29 +132,34 @@ 3t 3tk 3tcl 3tclx 3tix 7l 7nr 8c - Cg g s m) - SEC="${SEC[@]}" - rm -f configure -%global optflags %{optflags} -funroll-loops -pipe -Wall - if grep -q _DEFAULT_SOURCE %{_includedir}/features.h ; then + Cg g s m +) +SEC="${SEC[@]}" +if grep -q _DEFAULT_SOURCE %{_includedir}/features.h ; then CFLAGS="%{optflags} -D_GNU_SOURCE -D_DEFAULT_SOURCE" - else +else CFLAGS="%{optflags} -D_GNU_SOURCE -D_SVID_SOURCE" - fi - LDFLAGS= - LIBS= - LINGUAS= - for d in $(cat man/LINGUAS*) ; do +fi +for d in $(cat man/LINGUAS*) ; do test -d %{_datadir}/locale/$d || continue LINGUAS="${LINGUAS:+$LINGUAS }$d" - done - export CFLAGS LDFLAGS LIBS LINGUAS - aclocal -I ${PWD} -I ${PWD}/m4 -I ${PWD}/gl/m4 - autoconf -B ${PWD} -B ${PWD}/m4 -B ${PWD}/gl/m4 - automake --add-missing - find -name 'Makefile.*' | xargs \ +done + +LIBS="-lalternatives" + +export CFLAGS LINGUAS LIBS +# Create configure +aclocal -I ${PWD} -I ${PWD}/m4 -I ${PWD}/gl/m4 +autoconf -B ${PWD} -B ${PWD}/m4 -B ${PWD}/gl/m4 +automake --add-missing +find -name 'Makefile.*' | xargs \ sed -ri -e '/^pkglibdir/{ s@^(pkglibdir[[:blank:]]+=[[:blank:]]+\$\(libdir\)).*@\1@p }' - %configure \ +# Configure +%configure \ +%if %{without sdtimer} + --with-systemdtmpfilesdir=no \ + --with-systemdsystemunitdir=no \ +%endif --enable-dups \ --enable-cache-owner=man \ --with-device=utf8 \ @@ -165,8 +176,9 @@ --with-config-file=%{_sysconfdir}/manpath.config \ --without-included-gettext \ --with-sections="${SEC}" - %make_build nls=all - for man in $(find man/ -type f -a -name '*.[0-9]'); do +%make_build nls=all +# Fix coding +for man in $(find man/ -type f -a -name '*.[0-9]'); do pp="$(head -n 1 $man)" case "$pp" in \'\\\"*\ -\*-\ coding:\ *\ -\*-) @@ -180,9 +192,10 @@ '\\\\\" -\*- coding: UTF-8 -\*-\ " $man esac - done - patch --backup --suffix=.s10 ${FUZZ+"--fuzz=$FUZZ"} -p0 < %{SOURCE10} - gcc $CFLAGS -I gl/lib/ -I include/ --include config.h -D LOCALEDIR="\"%{_datarootdir}/locale\"" \ +done +# +gcc $CFLAGS -I gl/lib/ -I include/ --include config.h \ + -D LOCALEDIR="\"%{_datarootdir}/locale\"" \ -D LIBEXECDIR="\"%{_libexecdir}\"" -o wrapper %{SOURCE5} -L gl/lib/.libs/ -lgnu %check @@ -195,74 +208,63 @@ %if 0%{?suse_version} <= 1030 export MKDIR_P="mkdir -p" %endif - rm -rf %{buildroot}%{_localstatedir}/cache/man - mkdir -p %{buildroot}%{_docdir}/man - mkdir -p %{buildroot}%{_libexecdir}/man-db - mkdir -p %{buildroot}%{_bindir} - mkdir -p %{buildroot}%{_sysconfdir} - mkdir -p %{buildroot}%{_mandir} - mkdir -p %{buildroot}%{_sysconfdir}/alternatives - make nls=all install DESTDIR=%{buildroot} +rm -rf %{buildroot}%{_localstatedir}/cache/man +%make_install nls=all find %{buildroot} -type f -name "*.la" -delete -print - mv %{buildroot}%{_datadir}/doc/man-db/man-db-manual.* \ - %{buildroot}%{_docdir}/man/ - # wrapper which drops roots privileges if root executes man or mandb - mv -vf %{buildroot}%{_bindir}/man %{buildroot}%{_libexecdir}/man-db/ - mv -vf %{buildroot}%{_bindir}/mandb %{buildroot}%{_libexecdir}/man-db/ - rm -vf %{buildroot}%{_bindir}/apropos - mv -vf %{buildroot}%{_bindir}/whatis %{buildroot}%{_libexecdir}/man-db/ - install wrapper %{buildroot}%{_libexecdir}/man-db/ - ln -sf %{_libexecdir}/man-db/wrapper %{buildroot}%{_sysconfdir}/alternatives/man - ln -sf %{_libexecdir}/man-db/wrapper %{buildroot}%{_bindir}/mandb - ln -sf %{_libexecdir}/man-db/whatis %{buildroot}%{_sysconfdir}/alternatives/apropos - ln -sf %{_libexecdir}/man-db/whatis %{buildroot}%{_sysconfdir}/alternatives/whatis - ln -sf %{_sysconfdir}/alternatives/man %{buildroot}%{_bindir}/man - ln -sf %{_sysconfdir}/alternatives/apropos %{buildroot}%{_bindir}/apropos - ln -sf %{_sysconfdir}/alternatives/whatis %{buildroot}%{_bindir}/whatis - pushd %{buildroot}%{_mandir}/ - rm -rf *.ascii/ - for d in *.UTF-8 ; do +# Move manual +mkdir -p %{buildroot}%{_docdir} +mv %{buildroot}%{_datadir}/doc/man-db %{buildroot}%{_docdir}/man/ +# wrapper which drops roots privileges if root executes man or mandb +mv -vf %{buildroot}%{_bindir}/man %{buildroot}%{_libexecdir}/man-db/ +mv -vf %{buildroot}%{_bindir}/mandb %{buildroot}%{_libexecdir}/man-db/ +rm -vf %{buildroot}%{_bindir}/apropos +mv -vf %{buildroot}%{_bindir}/whatis %{buildroot}%{_libexecdir}/man-db/ +install -D -m 0755 wrapper %{buildroot}%{_libexecdir}/man-db/ +install -d -m 0755 %{buildroot}%{_sysconfdir}/alternatives +ln -sf %{_libexecdir}/man-db/wrapper %{buildroot}%{_sysconfdir}/alternatives/man +ln -sf %{_libexecdir}/man-db/wrapper %{buildroot}%{_bindir}/mandb +ln -sf %{_libexecdir}/man-db/whatis %{buildroot}%{_sysconfdir}/alternatives/apropos +ln -sf %{_libexecdir}/man-db/whatis %{buildroot}%{_sysconfdir}/alternatives/whatis +ln -sf %{_sysconfdir}/alternatives/man %{buildroot}%{_bindir}/man +ln -sf %{_sysconfdir}/alternatives/apropos %{buildroot}%{_bindir}/apropos +ln -sf %{_sysconfdir}/alternatives/whatis %{buildroot}%{_bindir}/whatis +# Fix man pages +pushd %{buildroot}%{_mandir}/ +rm -rf *.ascii/ +for d in *.UTF-8 ; do find -name '*.[1-9nlop]' | xargs gzip -9f - done - for d in `find -name manpath.5%{?ext_man} -printf '%%h '` ; do +done +for d in `find -name manpath.5%{?ext_man} -printf '%%h '` ; do ln -sf manpath.5%{?ext_man} $d/manpath.config.5%{?ext_man} - done - - for man in apropos man whatis - do +done +for man in apropos man whatis; do mv man1/${man}.1%{?ext_man} man1/${man}-db.1%{?ext_man} ln -sf %{_sysconfdir}/alternatives/${man}.1%{?ext_man} man1/${man}.1%{?ext_man} ln -sf %{_mandir}/man1/${man}-db.1%{?ext_man} %{buildroot}%{_sysconfdir}/alternatives/${man}.1%{?ext_man} - done - - # remove japanese pages, as they are in man-pages-ja - # (need to cross verify at some point that they are up to date there) - rm -rf ja - - popd - install -m 644 src/man_db.conf %{buildroot}%{_sysconfdir}/manpath.config - sh ./mk_catdirs %{buildroot} - mkdir -p %{buildroot}%{_datadir}/groff/site-tmac - install -m 0644 groff/tmac.andb %{buildroot}%{_datadir}/groff/site-tmac/ - install -m 0644 groff/tmac.andocdb %{buildroot}%{_datadir}/groff/site-tmac/ - mkdir -p %{buildroot}%{_fillupdir} - mkdir -p %{buildroot}%{_unitdir}/ +done +# remove japanese pages, as they are in man-pages-ja +# (need to cross verify at some point that they are up to date there) +rm -rf ja +popd + +install -m 644 src/man_db.conf %{buildroot}%{_sysconfdir}/manpath.config +sh ./mk_catdirs %{buildroot} +mkdir -p %{buildroot}%{_datadir}/groff/site-tmac +install -m 0644 groff/tmac.andb %{buildroot}%{_datadir}/groff/site-tmac/ +install -m 0644 groff/tmac.andocdb %{buildroot}%{_datadir}/groff/site-tmac/ +mkdir -p %{buildroot}%{_fillupdir} +mkdir -p %{buildroot}%{_unitdir}/ %if 0%{?suse_version} < 1500 mkdir -p %{buildroot}%{_sysconfdir}/cron.daily %endif - install -m 0644 %{SOURCE1} %{buildroot}%{_fillupdir} + install -m 0644 %{SOURCE3} %{buildroot}%{_fillupdir} %if 0%{?suse_version} < 1500 - install -m 0744 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.daily/suse-do_mandb + install -m 0744 %{SOURCE4} %{buildroot}%{_sysconfdir}/cron.daily/suse-do_mandb %else - install -m 0744 %{SOURCE2} %{buildroot}/%{_libexecdir}/man-db/do_mandb + install -m 0744 %{SOURCE4} %{buildroot}/%{_libexecdir}/man-db/do_mandb %endif %if %{with sdtimer} install -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/ -%if 0%{?suse_version} >= 1500 - install -m 0644 %{SOURCE8} %{buildroot}%{_unitdir}/ - install -m 0644 %{SOURCE9} %{buildroot}%{_unitdir}/ - sed -ri 's|@@LIBEXECDIR@@|%{_libexecdir}|' %{buildroot}%{_unitdir}/mandb.service -%endif %endif %find_lang man-db --all-name --with-man @@ -271,7 +273,7 @@ test -d var/catman/ && rm -rf var/catman/ || true %if %{with sdtimer} %if 0%{?suse_version} >= 1500 -%service_add_pre man-db-create.service mandb.service mandb.timer +%service_add_pre man-db-create.service man-db.service man-db.timer %else %service_add_pre man-db-create.service %endif @@ -283,7 +285,7 @@ %if %{with sdtimer} %service_add_post man-db-create.service %if 0%{?suse_version} >= 1500 -%service_add_post mandb.service mandb.timer +%service_add_post man-db.service man-db.timer %endif %endif # Remark: soelim(1) is part of package groff or mandoc and @@ -309,7 +311,7 @@ %if %{with sdtimer} %service_del_preun man-db-create.service %if 0%{?suse_version} >= 1500 -%service_del_preun mandb.service mandb.timer +%service_del_preun man-db.service man-db.timer %endif %endif @@ -318,7 +320,7 @@ %if %{with sdtimer} %service_del_postun man-db-create.service %if 0%{?suse_version} >= 1500 -%service_del_postun mandb.service mandb.timer +%service_del_postun man-db.service man-db.timer %endif %endif if [ ! -f %{_libexecdir}/man-db/wrapper ] ; then @@ -335,7 +337,7 @@ %files -f man-db.lang %license docs/COPYING %doc ChangeLog -%doc %{_docdir}/man/man-db-manual.* +%doc %{_docdir}/man/man-db-manual* %config %{_sysconfdir}/manpath.config %if 0%{?suse_version} < 1500 %attr(0744,root,root) %{_sysconfdir}/cron.daily/suse-do_mandb @@ -346,13 +348,14 @@ %ghost %{_sysconfdir}/alternatives/man.1%{ext_man} %ghost %{_sysconfdir}/alternatives/apropos.1%{ext_man} %ghost %{_sysconfdir}/alternatives/whatis.1%{ext_man} -%{_bindir}/man %{_bindir}/apropos -%{_bindir}/whatis -%{_bindir}/mandb %{_bindir}/catman %{_bindir}/lexgrog +%{_bindir}/man +%{_bindir}/mandb %{_bindir}/manpath +%{_bindir}/man-recode +%{_bindir}/whatis %dir %attr(0755,root,root) %{_libexecdir}/man-db %attr(0755,root,root) %{_libexecdir}/man-db/man %attr(0755,root,root) %{_libexecdir}/man-db/whatis @@ -373,8 +376,8 @@ %if %{with sdtimer} %{_unitdir}/man-db-create.service %if 0%{?suse_version} >= 1500 -%{_unitdir}/mandb.service -%{_unitdir}/mandb.timer +%{_unitdir}/man-db.service +%{_unitdir}/man-db.timer %endif %endif %dir %{_datadir}/groff/site-tmac @@ -385,6 +388,7 @@ %{_mandir}/man8/*.8%{?ext_man} %dir %{_mandir}/id %dir %{_mandir}/sr +%dir %{_mandir}/ro %dir %{_mandir}/tr %{_fillupdir}/sysconfig.cron-man %defattr(-,man,man) ++++++ man-db-2.6.3-listall.dif ++++++ --- /var/tmp/diff_new_pack.OfZKH1/_old 2021-06-25 15:01:25.636158114 +0200 +++ /var/tmp/diff_new_pack.OfZKH1/_new 2021-06-25 15:01:25.636158114 +0200 @@ -205,3 +205,20 @@ return found; } +--- man/man1/man.man1 ++++ man/man1/man.man1 2016-12-15 14:10:47.883461034 +0000 +@@ -1344,6 +1344,14 @@ However, some users want to see them any + .RB $ MAN_KEEP_STDERR + is set to any non-empty value, error output will be displayed as usual. + .TP ++.if !'po4a'hide' .BR MAN_POSIXLY_CORRECT ++If many man pages are available corresponding to the requested one, ++.B %man% ++will display them in a list, unless ++.RB $ MAN_POSIXLY_CORRECT ++is set, in which case the first page in the list will be displayed ++automatically. ++.TP + .if !'po4a'hide' .BR LANG , " LC_MESSAGES" + Depending on system and implementation, either or both of + .RB $ LANG ++++++ man-db-2.6.3-man0.dif ++++++ --- /var/tmp/diff_new_pack.OfZKH1/_old 2021-06-25 15:01:25.652158134 +0200 +++ /var/tmp/diff_new_pack.OfZKH1/_new 2021-06-25 15:01:25.652158134 +0200 @@ -1,61 +1,5 @@ ---- - man/de/man1/man.1 | 3 +++ - man/es/man1/man.1 | 3 +++ - man/it/man1/man.1 | 3 +++ - man/ja/man1/man.1 | 3 +++ - man/man1/man.1 | 3 +++ - 5 files changed, 15 insertions(+) - ---- man/de/man1/man.1 -+++ man/de/man1/man.1 2018-11-23 14:23:22.531297359 +0000 -@@ -83,6 +83,9 @@ und den Typ der dort zu findenden Seiten - .TS - tab (@); - l lx. -+0@T{ -+Dateiheader (gew??hnlich in \fI/usr/include\fR) -+T} - 1@T{ - Ausf??hrbare Programme oder Shell\-Befehle - T} ---- man/es/man1/man.1 -+++ man/es/man1/man.1 2018-11-23 14:23:22.531297359 +0000 -@@ -80,6 +80,9 @@ seguidos por el tipo de p??gina que cont - .TS - tab (@); - l lx. -+0@T{ -+Ficheros (se encuentran generalmente en \fI/usr/include\fR) -+T} - 1@T{ - Programa ejecutable o mandatos del shell - T} ---- man/it/man1/man.1 -+++ man/it/man1/man.1 2018-11-23 14:23:22.531297359 +0000 -@@ -124,6 +124,9 @@ del manuale seguiti dai tipi di pagine c - .TS - tab (@); - l lx. -+0@T{ -+File (di solito trovabili in \fI/usr/include\fR) -+T} - 1@T{ - Programmi eseguibili e comandi della shell - T} ---- man/ja/man1/man.1 -+++ man/ja/man1/man.1 2018-11-23 14:23:22.531297359 +0000 -@@ -78,6 +78,9 @@ default, unless overridden by the \fBSEC - .TS - tab (@); - l lx. -+0@T{ -+(\fIusr/include\fP) -+T} - 1@T{ - ??????????????????????????????????????????????????? - T} ---- man/man1/man.1 -+++ man/man1/man.1 2018-11-23 14:23:22.531297359 +0000 +--- man/man1/man.man1 ++++ man/man1/man.man1 2018-11-23 14:23:22.531297359 +0000 @@ -186,6 +186,9 @@ numbers of the manual followed by the ty .TS tab (@); ++++++ man-db-2.7.1-security4.dif ++++++ --- /var/tmp/diff_new_pack.OfZKH1/_old 2021-06-25 15:01:25.668158153 +0200 +++ /var/tmp/diff_new_pack.OfZKH1/_new 2021-06-25 15:01:25.668158153 +0200 @@ -5,7 +5,7 @@ --- src/mandb.c +++ src/mandb.c 2018-11-23 12:50:40.139688661 +0000 @@ -442,18 +442,27 @@ static int mandb (struct dbpaths *dbpath - int ret, amount; + int amount; char *dbname; int should_create; + int fd; ++++++ man-db-2.7.1-zio.dif ++++++ --- /var/tmp/diff_new_pack.OfZKH1/_old 2021-06-25 15:01:25.692158182 +0200 +++ /var/tmp/diff_new_pack.OfZKH1/_new 2021-06-25 15:01:25.696158187 +0200 @@ -37,9 +37,9 @@ MAN_ARG_AUTOMATIC_CREATE MAN_ARG_AUTOMATIC_UPDATE MAN_ARG_CATS -@@ -325,6 +337,46 @@ AC_SUBST([unlzma]) - AC_SUBST([unxz]) +@@ -346,6 +358,46 @@ AC_SUBST([unxz]) AC_SUBST([unlzip]) + AC_SUBST([unzstd]) MAN_COMPRESS_LIB([z], [gzopen]) +dnl Check for zlib and libbz2 libraries to use this together +dnl with SUSE's libzio to open compressed info files. @@ -84,8 +84,8 @@ dnl To add more decompressors just follow the scheme above. # Check for various header files and associated libraries. ---- lib/decompress.c -+++ lib/decompress.c 2018-11-23 13:12:59.714923151 +0000 +--- src/decompress.c ++++ src/decompress.c 2018-11-23 13:12:59.714923151 +0000 @@ -38,6 +38,10 @@ #include "xvasprintf.h" ++++++ man-db-2.9.4-alternitive.dif ++++++ diff -u orig/man.c patch/man.c --- src/man.c 2021-06-07 22:06:42.937525661 +0200 +++ src/man.c 2021-06-08 11:46:40.369916468 +0200 @@ -57,6 +57,7 @@ #include <sys/types.h> #include <sys/stat.h> #include <sys/time.h> +#include <libalternatives.h> #include "argp.h" #include "dirname.h" @@ -4066,11 +4067,25 @@ int *found) { char *mp; + int count = 0; - GL_LIST_FOREACH_START (manpathlist, mp) - *found += locate_page (mp, page_section, page_name, - candidates); - GL_LIST_FOREACH_END (manpathlist); + GL_LIST_FOREACH_START (manpathlist, mp) { + count = locate_page (mp, page_section, page_name, candidates); + if (count == 0) { + /* Checking if there has been defined another manpage defined in the */ + /* priorities of libalternatives. */ + char **alternitives = libalts_get_default_manpages(page_name); + for (char **alter = alternitives; *alter; alter++){ + char *p_name, *p_section; + split_page_name (*alter, &p_name, &p_section); + if (p_name && strlen(p_name)>0 && p_section && strlen(p_section)>0) + count = locate_page (mp, p_section, p_name, candidates); + free(*alter); + } + free(alternitives); + } + *found += count; + } GL_LIST_FOREACH_END (manpathlist); } /* ++++++ man-db-2.9.4-no-chown.patch ++++++ diff -Nur man-db-2.9.4/src/Makefile.am new/src/Makefile.am --- man-db-2.9.4/src/Makefile.am 2020-01-01 16:11:59.000000000 +0100 +++ new/src/Makefile.am 2021-05-31 23:36:22.062144466 +0200 @@ -192,16 +192,7 @@ all-am: apropos$(EXEEXT) install-exec-hook: - if [ "$(man_owner)" ] && [ "$(man_mode)" = 6755 ]; then \ - chown $(man_owner):$(man_owner) \ - $(DESTDIR)$(bindir)/$(TRANS_MAN) \ - $(DESTDIR)$(bindir)/$(TRANS_MANDB); \ - fi - chmod $(man_mode) \ - $(DESTDIR)$(bindir)/$(TRANS_MAN) \ - $(DESTDIR)$(bindir)/$(TRANS_MANDB) - cd $(DESTDIR)$(bindir) && rm -f $(TRANS_APROPOS)$(EXEEXT) && \ - $(LN_S) $(TRANS_WHATIS)$(EXEEXT) $(TRANS_APROPOS)$(EXEEXT) + $(LN_S) $(TRANS_WHATIS) $(DESTDIR)$(bindir)/$(TRANS_APROPOS) install-data-hook: @if test -f $(DESTDIR)$(config_file); then \ ++++++ man-db-2.9.4.patch ++++++ ++++ 791 lines (skipped) ++++++ man-db-2.8.4.tar.xz -> man-db-2.9.4.tar.xz ++++++ ++++ 231307 lines of diff (skipped)
