From 2f2779d0cb845e46bb8b9bfea298f7d7a1ec1795 Mon Sep 17 00:00:00 2001
From: Ikey Doherty <ikey@serpentos.com>
Date: Wed, 31 Jan 2024 20:58:45 +0000
Subject: [PATCH] man-db: Various packaging improvements

 - Update to 2.12.0
 - Use a proper release tarball
 - Drop spurious builddeps
 - Add `mandb` moss pre trigger

Signed-off-by: Ikey Doherty <ikey@serpentos.com>
---
 m/man-db/manifest.x86_64.bin   | Bin 592 -> 597 bytes
 m/man-db/manifest.x86_64.jsonc |  16 +++++++++++-----
 m/man-db/pkg/trigger.yaml      |  13 +++++++++++++
 m/man-db/stone.yml             |  14 +++++---------
 4 files changed, 29 insertions(+), 14 deletions(-)
 create mode 100644 m/man-db/pkg/trigger.yaml

diff --git a/m/man-db/manifest.x86_64.bin b/m/man-db/manifest.x86_64.bin
index 3c7416fd5c4020464d1cdb3fc91f9e5affd651a0..72ae1708fb3183f9c23550c71cc06e355c2d4865 100644
GIT binary patch
delta 569
zcmV-90>=H&1l0tPCw~<H0000000bRGC4-)IrfT8<001Ze0RaLiwJ-euXk`!pwi{S2
zKyTZ_Fbu;m41kep+Z!ueh5h!qa`okJ`2ZgKGq!16$zTCd0`TXj_eUl+1xNrz08s$#
zV%KNqRNlxMy>d9K$Fcbz3+%}5?mN|!V^@4x@olhcrz|T+`G0D+2j{d{C}10QS3>Y?
zWne22Q3exb76RDGvDno@lBMi!ySvf<tIY}FdU<8F;f7&9*R*<TI5|G{@2P7$zQAA+
zhyFqRf}7vp;;O-si(OT+QSrUS&i}o&=F01fyw#-R>%|UsG)^|B>@pFU90SCI{D@5t
zN)#wbsmo#Ps(*HSIVGJvfhaowtp&4TAVIx0WK^<<D8n{5G8VdQ!Gy*`LvbziP$Y`V
z$cj{yF_NT;pS5xpn(RUgrL5C~zn#a`??4Yhd(>lr4&sho4mW$5uQMrFN@rHGHU9*R
z#|M4BsZdRhLeR8>%|=pcLdit(qX`XTkU1z#4@&ec34dTMm383Mo*q-E!DM5UnVAVv
zlD04hpe8b-dNEjJ4O1pWDb@_#Jix#OJ_lMI;z8g{m!-C(+D%%B>ok`jl_^Q}`2YDc
z*r8LLQxq>M@H>%gFq`g1w5))Eo$s+)C5N>W7e}Jx3eOWaK?Wv1{Vsl3DMyacApBST
z`Y|LuEi#OFU$pSDAY27@83d(_)Y+=dYedUX=$wC!0R-v^xglmYl{vrfLDNR54Iyr%
H#|zT?TH6Qo

delta 564
zcmV-40?Yl?1kePKCw~wC0000000aI@_LdaiqHDzf001Ze0RaLiwJ-euXgv@B=9^e8
zP;J{VGcz+YtL(<;B)785FV;FmP9*OOBGVQws~>wzKm-EX;TpB?cQIpa3P}J)08s#O
zgB$G@`zt%=nUWtJ`kT;kY_5(4He`3VdexI-L%yu&GPt!<mVeJtx^L#*oD>TM>;ge#
zDVC*VBn(E%ECjHd7R81OMRu~g0i1=NRoLB?YIWb75B|$P`hFC@cCG0<>o++%_S&2N
zZd_r(ApX3AdIdLEuNFTBOD#5pl2y@Fi<{T#j5S053Q{d58(%JO+PF8-YE1xJp)3RE
zdrrJb<}?}*sDC7_E`PD%H>+|=I{SepYk{_c$tZxJ{{12<qX#JyWoTS1G_aQl4TnbJ
zT1YaPDk>!_R#8T2nkMS}5BsG2jeB)FlJ>O&QBkt0gMhiJp``NM!&`LuqjtK^bNT4x
zlyCL3mCIT>6H3OsB49ka=hMvuxM|gahD8i0O490aXn)8^vPuz}D0)!~P^j@>A~Q5I
zL6oK~EC+xlI#={C(43SQG>rlA3e@h+Twofd4m=T@e74K5@KUgcsseZ%P8j!qX)02(
z=Uw<r{UG2tV@zKn`WOga25Vsam1ij=DltqFqz3Z%L9`2IK>&%f<x;MT@F3(MO`7zR
zvcy6Ofh{*cn7sCCsPx<@<|<ii#80TRpD#ZyBh;JR#WO@@{_l6_+t`y4^R-K(m?s4(
CdjP8d

diff --git a/m/man-db/manifest.x86_64.jsonc b/m/man-db/manifest.x86_64.jsonc
index 0e6d3bed..671627b4 100644
--- a/m/man-db/manifest.x86_64.jsonc
+++ b/m/man-db/manifest.x86_64.jsonc
@@ -4,14 +4,12 @@
 	"packages": {
 		"man-db": {
 			"build-depends": [
-				"binary(autopoint)",
 				"binary(groff)",
 				"binary(gzip)",
 				"flex-devel",
 				"gdbm-devel",
 				"pkgconfig(libmagic)",
 				"pkgconfig(libpipeline)",
-				"pkgconfig(libpkgconf)",
 				"pkgconfig(libseccomp)",
 				"pkgconfig(libzstd)",
 				"pkgconfig(zlib)",
@@ -34,6 +32,10 @@
 				"/usr/bin/mandb",
 				"/usr/bin/manpath",
 				"/usr/bin/whatis",
+				"/usr/lib/man-db/libman-2.12.0.so",
+				"/usr/lib/man-db/libman.so",
+				"/usr/lib/man-db/libmandb-2.12.0.so",
+				"/usr/lib/man-db/libmandb.so",
 				"/usr/lib/man-db/man-db/globbing",
 				"/usr/lib/man-db/man-db/manconv",
 				"/usr/lib/man-db/man-db/zsoelim",
@@ -76,6 +78,7 @@
 				"/usr/share/locale/ja/LC_MESSAGES/man-db-gnulib.mo",
 				"/usr/share/locale/ja/LC_MESSAGES/man-db.mo",
 				"/usr/share/locale/ka/LC_MESSAGES/man-db-gnulib.mo",
+				"/usr/share/locale/ka/LC_MESSAGES/man-db.mo",
 				"/usr/share/locale/ko/LC_MESSAGES/man-db-gnulib.mo",
 				"/usr/share/locale/ko/LC_MESSAGES/man-db.mo",
 				"/usr/share/locale/ms/LC_MESSAGES/man-db-gnulib.mo",
@@ -128,7 +131,8 @@
 				"/usr/share/man/man5/manpath.5",
 				"/usr/share/man/man8/accessdb.8",
 				"/usr/share/man/man8/catman.8",
-				"/usr/share/man/man8/mandb.8"
+				"/usr/share/man/man8/mandb.8",
+				"/usr/share/moss/triggers/pre.d/mandb.yaml"
 			],
 			"name": "man-db",
 			"provides": [
@@ -136,6 +140,8 @@
 				"binary(apropos)",
 				"binary(catman)",
 				"binary(lexgrog)",
+				"soname(libman-2.12.0.so(x86_64))",
+				"soname(libmandb-2.12.0.so(x86_64))",
 				"binary(man)",
 				"binary(man-recode)",
 				"binary(mandb)",
@@ -145,6 +151,6 @@
 		}
 	},
 	"source-name": "man-db",
-	"source-release": "1",
-	"source-version": "2.11.2"
+	"source-release": "2",
+	"source-version": "2.12.0"
 }
diff --git a/m/man-db/pkg/trigger.yaml b/m/man-db/pkg/trigger.yaml
new file mode 100644
index 00000000..f5dd4836
--- /dev/null
+++ b/m/man-db/pkg/trigger.yaml
@@ -0,0 +1,13 @@
+name: mandb
+description: |
+    Rebuild the man page database
+
+handlers:
+    mandb:
+        run: /usr/bin/mandb
+        args: ["-q"]
+
+paths:
+    "/usr/share/man/man*/*" :
+        handlers:
+            - mandb
\ No newline at end of file
diff --git a/m/man-db/stone.yml b/m/man-db/stone.yml
index 557f387c..288bb73e 100644
--- a/m/man-db/stone.yml
+++ b/m/man-db/stone.yml
@@ -4,11 +4,11 @@
 # SPDX-License-Identifier: MPL-2.0
 #
 name        : man-db
-version     : 2.11.2
-release     : 1
+version     : 2.12.0
+release     : 2
 homepage    : https://man-db.nongnu.org/
 upstreams   :
-    - https://mirror.hostiran.ir/gnu/releases/man-db/man-db-2.11.2.tar.xz : cffa1ee4e974be78646c46508e6dd2f37e7c589aaab2938cc1064f058fef9f8d
+    - https://download.savannah.nongnu.org/releases/man-db/man-db-2.12.0.tar.xz : 415a6284a22764ad22ff0f66710d853be7790dd451cd71436e3d25c74d996a95
 summary     : Application to read Linux man pages
 description : |
     man-db is an implementation of the standard Unix documentation system accessed using the man command. It uses a Berkeley DB database in place of the traditional flat-text whatis databases.
@@ -16,14 +16,11 @@ license     :
     - GPL-2.0-or-later
     - GPL-3.0-or-later
     - LGPL-2.1-or-later
-toolchain   : gnu # slibtool issues
 builddeps   :
-    - binary(autopoint)
     - binary(groff)
     - binary(gzip)
     - pkgconfig(libmagic)
     - pkgconfig(libpipeline)
-    - pkgconfig(libpkgconf)
     - pkgconfig(libseccomp)
     - pkgconfig(libzstd)
     - pkgconfig(zlib)
@@ -34,7 +31,7 @@ rundeps     :
     - binary(groff)
 setup       : |
     %patch %(pkgdir)/stateless.patch
-    %reconfigure \
+    %configure \
          --disable-setuid \
          --enable-cache-owner=root \
          --with-db=gdbm \
@@ -43,5 +40,4 @@ build       : |
     %make
 install     : |
     %make_install
-
-    rm %(installroot)/%(libdir)/man-db/*.a
+    %install_file %(pkgdir)/trigger.yaml %(installroot)/usr/share/moss/triggers/pre.d/mandb.yaml