added core/man-db
This commit is contained in:
Kevin Mihelich
parent
a64ce7c2ac
commit
6f971d787e
|
|
@ -0,0 +1,79 @@
|
|||
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
|
||||
# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
|
||||
|
||||
# ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
|
||||
# - upstream patch to fix FTBFS
|
||||
|
||||
pkgname=man-db
|
||||
pkgver=2.10.0
|
||||
pkgrel=1
|
||||
pkgdesc="A utility for reading man pages"
|
||||
arch=('x86_64')
|
||||
url="https://www.nongnu.org/man-db/"
|
||||
license=('GPL' 'LGPL')
|
||||
depends=( 'bash' 'gdbm' 'zlib' 'groff' 'libpipeline' 'less' 'libseccomp')
|
||||
makedepends=('po4a')
|
||||
optdepends=('gzip') # covered by virtual "base" package
|
||||
backup=('etc/man_db.conf')
|
||||
conflicts=('man')
|
||||
provides=('man')
|
||||
replaces=('man')
|
||||
install=${pkgname}.install
|
||||
source=(https://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.asc}
|
||||
# fallback should be used within first 24h after a release
|
||||
#https://download-mirror.savannah.gnu.org/releases/man-db/$pkgname-$pkgver.tar.xz{,.asc}
|
||||
f4f94402834f20b9da730aeca5daa465be38efdf.patch
|
||||
snapdir.diff
|
||||
convert-mans
|
||||
)
|
||||
validpgpkeys=('AC0A4FF12611B6FCCF01C111393587D97D86500B') # Colin Watson <cjwatson@debian.org>
|
||||
sha512sums=('de9c9f3dd9e6a578eb99aca0d04ce5c98cf6733e83e3be5299b6cafc4aad202896429a263a34111529eccdf07c353438afdade278818fc5d884471df7a4816c9'
|
||||
'SKIP'
|
||||
'79f24aae532b9a152b18711f591c548efa2ab67ec272cbafd1715848a494f49662883d3b7d517217a5ce66fd3b79f22dba8e7bf3b81f422d5b3234225785b653'
|
||||
'f24a8152c82c3b99dab2c34654382512f226bb6b0e5e3b1376d577019a4cca0f4e5a9ac92c62ed7ea5cf0ed3ad94509d34f455d845bc5fb026ef908da82cd5fe'
|
||||
'0b159285da20008f0fc0afb21f1eaebd39e8df5b0594880aa0e8a913b656608b8d16bb8d279d9e62d7aae52f62cb9b2fc49e237c6711f4a5170972b38d345535')
|
||||
|
||||
prepare() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
# fix default Add MANDB_MAP entry mapping /snap/man to /var/cache/man/snap
|
||||
# Arch needs /var/lib/snapd/snap/man to /var/cache/man/snap
|
||||
patch -Np0 -i ../snapdir.diff
|
||||
|
||||
patch -p1 -i ../f4f94402834f20b9da730aeca5daa465be38efdf.patch
|
||||
}
|
||||
|
||||
|
||||
build() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
./configure --prefix=/usr \
|
||||
--sbindir=/usr/bin \
|
||||
--sysconfdir=/etc \
|
||||
--libexecdir=/usr/lib \
|
||||
--with-systemdsystemunitdir=/usr/lib/systemd/system \
|
||||
--with-db=gdbm \
|
||||
--disable-setuid \
|
||||
--enable-cache-owner=root \
|
||||
--enable-mandirs=GNU \
|
||||
--with-sections="1 1p n l 8 3 3p 0 0p 2 5 4 9 6 7"
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
make check
|
||||
}
|
||||
|
||||
package() {
|
||||
cd ${pkgname}-${pkgver}
|
||||
make DESTDIR=${pkgdir} install
|
||||
|
||||
# part of groff pkg
|
||||
rm -f ${pkgdir}/usr/bin/zsoelim
|
||||
|
||||
# script from LFS to convert manpages, see
|
||||
# http://www.linuxfromscratch.org/lfs/view/6.4/chapter06/man-db.html
|
||||
install -D -m755 ${srcdir}/convert-mans ${pkgdir}/usr/bin/convert-mans
|
||||
|
||||
install -d -m755 ${pkgdir}/usr/lib/systemd/system/timers.target.wants
|
||||
ln -s ../man-db.timer ${pkgdir}/usr/lib/systemd/system/timers.target.wants/man-db.timer
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
#!/bin/sh -e
|
||||
FROM="$1"
|
||||
TO="$2"
|
||||
shift ; shift
|
||||
while [ $# -gt 0 ]
|
||||
do
|
||||
FILE="$1"
|
||||
shift
|
||||
iconv -f "$FROM" -t "$TO" "$FILE" >.tmp.iconv
|
||||
mv .tmp.iconv "$FILE"
|
||||
done
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
From f4f94402834f20b9da730aeca5daa465be38efdf Mon Sep 17 00:00:00 2001
|
||||
From: Colin Watson <cjwatson@debian.org>
|
||||
Date: Sun, 6 Feb 2022 12:37:01 +0000
|
||||
Subject: [PATCH] Revert "Reduce indentation depth using C99"
|
||||
|
||||
This reverts commit c4d20840f3487588c4a0da4397b1acb6dc83a1e5. Even in
|
||||
C99, a declaration isn't valid immediately after a label; this didn't
|
||||
become valid until C2x, although gcc allows it as an extension.
|
||||
|
||||
Fixes https://gitlab.com/cjwatson/man-db/-/issues/2.
|
||||
|
||||
* src/man.c (parse_opt): Restore enclosing block for OPT_WARNINGS.
|
||||
* NEWS: Document this.
|
||||
---
|
||||
NEWS.md | 2 ++
|
||||
src/man.c | 17 ++++++++++-------
|
||||
2 files changed, 12 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/man.c b/src/man.c
|
||||
index c91abf15..5d5caaf1 100644
|
||||
--- a/src/man.c
|
||||
+++ b/src/man.c
|
||||
@@ -383,15 +383,18 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state)
|
||||
|
||||
case OPT_WARNINGS:
|
||||
#ifdef NROFF_WARNINGS
|
||||
- char *s = xstrdup (arg ? arg : default_roff_warnings);
|
||||
- const char *warning;
|
||||
+ {
|
||||
+ char *s = xstrdup
|
||||
+ (arg ? arg : default_roff_warnings);
|
||||
+ const char *warning;
|
||||
|
||||
- for (warning = strtok (s, ","); warning;
|
||||
- warning = strtok (NULL, ","))
|
||||
- gl_list_add_last (roff_warnings,
|
||||
- xstrdup (warning));
|
||||
+ for (warning = strtok (s, ","); warning;
|
||||
+ warning = strtok (NULL, ","))
|
||||
+ gl_list_add_last (roff_warnings,
|
||||
+ xstrdup (warning));
|
||||
|
||||
- free (s);
|
||||
+ free (s);
|
||||
+ }
|
||||
#endif /* NROFF_WARNINGS */
|
||||
return 0;
|
||||
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
post_upgrade() {
|
||||
# force database rebuild as recommended per upstream
|
||||
if [ "`vercmp $2 2.7.0`" -lt 0 ]; then
|
||||
echo "(re)building database..."
|
||||
mandb -c --quiet
|
||||
fi
|
||||
}
|
||||
|
||||
post_remove() {
|
||||
rm -rf /var/cache/man
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
--- src/man_db.conf.in 2020-01-27 13:25:03.000000000 +0100
|
||||
+++ src/man_db.conf.in.new 2020-02-26 07:40:32.726347889 +0100
|
||||
@@ -69,7 +69,8 @@
|
||||
MANDB_MAP /usr/local/share/man /var/cache/man/local
|
||||
MANDB_MAP /usr/X11R6/man /var/cache/man/X11R6
|
||||
MANDB_MAP /opt/man /var/cache/man/opt
|
||||
-MANDB_MAP /snap/man /var/cache/man/snap
|
||||
+MANDB_MAP /var/lib/snapd/snap/man /var/cache/man/snap
|
||||
+
|
||||
#
|
||||
#---------------------------------------------------------
|
||||
# Program definitions. These are commented out by default as the value
|
||||
Loading…
Reference in New Issue