man: Update to version 2.10.2

- Update from version 2.4.3 (2005) to 2.10.2 (2022)
- Update of rootfile
- Addition of libpipeline as a build dependency - separate patch for that.
- Changelog is too long to include here (~14000 lines)
   Details back to 2013 can be found in the file ChangeLog in the source tarball
   Details from 2013 back to version 2.4.3 can be found in the file ChangeLog-2013 in the
    source tarball
   90 bug fixes listed in ChangeLog
   128 bug fixes listed in Changelog-2013 back to the version after 2.4.3

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Reviewed-by: Peter Müller <peter.mueller@ipfire.org>

diff --git a/config/rootfiles/common/man b/config/rootfiles/common/man
index 39358d1100271f949411e756b6a2e31077d63b3f..21d8115f1acd7936dd46fb77f45d3aa3573de80b 100644 (file)
--- a/config/rootfiles/common/man
+++ b/config/rootfiles/common/man
@@ -3,56 +3,87 @@
 #usr/bin/catman
 #usr/bin/lexgrog
 #usr/bin/man
+#usr/bin/man-recode
 #usr/bin/mandb
 #usr/bin/manpath
 #usr/bin/whatis
-#usr/bin/zsoelim
 #usr/lib/man-db
+#usr/lib/man-db/libman-2.10.2.so
+#usr/lib/man-db/libman.la
+#usr/lib/man-db/libman.so
+#usr/lib/man-db/libmandb-2.10.2.so
+#usr/lib/man-db/libmandb.la
+#usr/lib/man-db/libmandb.so
+#usr/libexec/man-db
+#usr/libexec/man-db/globbing
+#usr/libexec/man-db/manconv
+#usr/libexec/man-db/zsoelim
 #usr/sbin/accessdb
+#usr/share/doc/man-db
+#usr/share/doc/man-db/man-db-manual.ps
+#usr/share/doc/man-db/man-db-manual.txt
+#usr/share/locale/af/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/ast/LC_MESSAGES/man-db.mo
+#usr/share/locale/be/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/bg/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/ca/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/ca/LC_MESSAGES/man-db.mo
+#usr/share/locale/cs/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/cs/LC_MESSAGES/man-db.mo
+#usr/share/locale/da/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/da/LC_MESSAGES/man-db.mo
+#usr/share/locale/de/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/de/LC_MESSAGES/man-db.mo
+#usr/share/locale/el/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/eo/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/eo/LC_MESSAGES/man-db.mo
+#usr/share/locale/es/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/es/LC_MESSAGES/man-db.mo
+#usr/share/locale/et/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/eu/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/fi/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/fi/LC_MESSAGES/man-db.mo
+#usr/share/locale/fr/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/fr/LC_MESSAGES/man-db.mo
+#usr/share/locale/ga/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/gl/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/hu/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/id/LC_MESSAGES/man-db.mo
+#usr/share/locale/it/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/it/LC_MESSAGES/man-db.mo
+#usr/share/locale/ja/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/ja/LC_MESSAGES/man-db.mo
+#usr/share/locale/ko/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/ms/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/nb/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/nl/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/nl/LC_MESSAGES/man-db.mo
+#usr/share/locale/pl/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/pl/LC_MESSAGES/man-db.mo
+#usr/share/locale/pt/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/pt/LC_MESSAGES/man-db.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/pt_BR/LC_MESSAGES/man-db.mo
-#usr/share/locale/ro
-#usr/share/locale/ro/LC_MESSAGES
+#usr/share/locale/ro/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/ro/LC_MESSAGES/man-db.mo
-#usr/share/locale/ru
-#usr/share/locale/ru/LC_MESSAGES
+#usr/share/locale/ru/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/ru/LC_MESSAGES/man-db.mo
+#usr/share/locale/rw/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/sk/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/sl/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/sr/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/sr/LC_MESSAGES/man-db.mo
+#usr/share/locale/sv/LC_MESSAGES/man-db-gnulib.mo
 #usr/share/locale/sv/LC_MESSAGES/man-db.mo
-#usr/share/man/de
-#usr/share/man/de/man1
-#usr/share/man/de/man1/apropos.1
-#usr/share/man/de/man1/man.1
-#usr/share/man/de/man1/manpath.1
-#usr/share/man/de/man1/whatis.1
-#usr/share/man/de/man1/zsoelim.1
-#usr/share/man/de/man5
-#usr/share/man/de/man5/manpath.5
-#usr/share/man/de/man8
-#usr/share/man/de/man8/accessdb.8
-#usr/share/man/de/man8/catman.8
-#usr/share/man/de/man8/mandb.8
-#usr/share/man/es
-#usr/share/man/es/man1
-#usr/share/man/es/man1/apropos.1
-#usr/share/man/es/man1/man.1
-#usr/share/man/es/man1/manpath.1
-#usr/share/man/es/man1/whatis.1
-#usr/share/man/es/man1/zsoelim.1
-#usr/share/man/es/man5
-#usr/share/man/es/man5/manpath.5
-#usr/share/man/es/man8
-#usr/share/man/es/man8/accessdb.8
-#usr/share/man/es/man8/catman.8
-#usr/share/man/es/man8/mandb.8
+#usr/share/locale/tr/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/tr/LC_MESSAGES/man-db.mo
+#usr/share/locale/uk/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/vi/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/vi/LC_MESSAGES/man-db.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/man-db.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/man-db-gnulib.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/man-db.mo
 #usr/share/man/it
 #usr/share/man/it/man1
 #usr/share/man/it/man1/apropos.1
@@ -66,22 +97,11 @@
 #usr/share/man/it/man8/accessdb.8
 #usr/share/man/it/man8/catman.8
 #usr/share/man/it/man8/mandb.8
-#usr/share/man/ja
-#usr/share/man/ja/man1
-#usr/share/man/ja/man1/apropos.1
-#usr/share/man/ja/man1/man.1
-#usr/share/man/ja/man1/manpath.1
-#usr/share/man/ja/man1/whatis.1
-#usr/share/man/ja/man1/zsoelim.1
-#usr/share/man/ja/man5
-#usr/share/man/ja/man5/manpath.5
-#usr/share/man/ja/man8
-#usr/share/man/ja/man8/accessdb.8
-#usr/share/man/ja/man8/catman.8
-#usr/share/man/ja/man8/mandb.8
 #usr/share/man/man1/apropos.1
 #usr/share/man/man1/lexgrog.1
+#usr/share/man/man1/man-recode.1
 #usr/share/man/man1/man.1
+#usr/share/man/man1/manconv.1
 #usr/share/man/man1/manpath.1
 #usr/share/man/man1/whatis.1
 #usr/share/man/man1/zsoelim.1

diff --git a/lfs/man b/lfs/man
index 16a3eae8930b8f8f67beb79f3d97801266e564d0..c6038c255aece7578c09848b99918236405d664b 100644 (file)
--- a/lfs/man
+++ b/lfs/man
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.4.3
+VER        = 2.10.2
 
 THISAPP    = man-db-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 022f3c39296e47b5fca348e49cfde234af304dbb815ff8a2977c75b8fe1890f9922ecb12e1271be4eb161cea50f3153c396b37b240104e009dd163c5dc998131
+$(DL_FILE)_BLAKE2 = 8d1748503cdf66a613d7544a27b42df9436bdf4e07ccb130d2fa62343488d2c4ab791238c348236a253abddb564db9d1bb851249da9911737ff822d822819599
 
 install : $(TARGET)
 
@@ -69,21 +69,19 @@ $(subst %,%_BLAKE2,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        $(UPDATE_AUTOMAKE)
 
-       cd $(DIR_APP) && mv man/de{_DE.88591,}
-       cd $(DIR_APP) && mv man/es{_ES.88591,}
-       cd $(DIR_APP) && mv man/it{_IT.88591,}
-       cd $(DIR_APP) && mv man/ja{_JP.eucJP,}
-       cd $(DIR_APP) && sed -i "s/-I-//g" {lib,src}/Makefile*
-       cd $(DIR_APP) && sed -i 's,\*_\*,??,' man/Makefile.in
-       cd $(DIR_APP) && sed -i '/\t\/usr\/man/d' src/man_db.conf.in
-       cd $(DIR_APP) && echo -e "#define WEB_BROWSER \"exec /usr/bin/lynx\"" >> include/manconfig.h.in
-       cd $(DIR_APP) && echo -e "#define COL \"/usr/bin/col\"" >> include/manconfig.h.in
-       cd $(DIR_APP) && echo -e "#define VGRIND \"/usr/bin/vgrind\"" >> include/manconfig.h.in
-       cd $(DIR_APP) && echo -e "#define GRAP \"/usr/bin/grap\"" >> include/manconfig.h.in
-       cd $(DIR_APP) && ./configure --prefix=/usr --enable-mb-groff --disable-setuid
+       cd $(DIR_APP) && ./configure \
+                       --prefix=/usr \
+                       --sysconfdir=/etc \
+                       --disable-setuid \
+                       --enable-cache-owner=bin \
+                    --with-browser=/usr/bin/lynx \
+                    --with-vgrind=/usr/bin/vgrind \
+                    --with-grap=/usr/bin/grap \
+                    --with-systemdtmpfilesdir= \
+                    --with-systemdsystemunitdir=
        cd $(DIR_APP) && make
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)