commit 27f623633cc23f71f3a8a9e255d65455625f5e48 Author: Juergen Daubert <jue@jue.li> Date: Mon Feb 7 17:12:29 2022 +0100 man-db: update to 2.10.0 diff --git a/man-db/.footprint b/man-db/.footprint index b57d02d3..16216bfe 100644 --- a/man-db/.footprint +++ b/man-db/.footprint @@ -15,12 +15,12 @@ lrwxrwxrwx root/root usr/bin/apropos -> whatis -rwxr-xr-x root/root usr/bin/whatis drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/man-db/ --rwxr-xr-x root/root usr/lib/man-db/libman-2.9.4.so +-rwxr-xr-x root/root usr/lib/man-db/libman-2.10.0.so -rwxr-xr-x root/root usr/lib/man-db/libman.la -lrwxrwxrwx root/root usr/lib/man-db/libman.so -> libman-2.9.4.so --rwxr-xr-x root/root usr/lib/man-db/libmandb-2.9.4.so +lrwxrwxrwx root/root usr/lib/man-db/libman.so -> libman-2.10.0.so +-rwxr-xr-x root/root usr/lib/man-db/libmandb-2.10.0.so -rwxr-xr-x root/root usr/lib/man-db/libmandb.la -lrwxrwxrwx root/root usr/lib/man-db/libmandb.so -> libmandb-2.9.4.so +lrwxrwxrwx root/root usr/lib/man-db/libmandb.so -> libmandb-2.10.0.so drwxr-xr-x root/root usr/lib/man-db/man-db/ -rwxr-xr-x root/root usr/lib/man-db/man-db/globbing -rwxr-xr-x root/root usr/lib/man-db/man-db/manconv diff --git a/man-db/.signature b/man-db/.signature index 4260e34f..5e0d4255 100644 --- a/man-db/.signature +++ b/man-db/.signature @@ -1,6 +1,7 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqjd/MNUXU+wp4f9IK0gpBihKYiegPYqtlREQeSPl+74KdxAp8Zh8dtxFA0A3f0D7NwOCPaKR+fT/Ity/+f2Ehgw= -SHA256 (Pkgfile) = c52b84c1b0c04668937a379ca5f7439cc5c313e413cb4284f080506c02ea644b -SHA256 (.footprint) = c15c148d1a1b494a97238ff1a8b23c1d263995c715cfc9dea8d5c6351d48c281 -SHA256 (man-db-2.9.4.tar.xz) = b66c99edfad16ad928c889f87cf76380263c1609323c280b3a9e6963fdb16756 +RWRJc1FUaeVeqgIPiMc5XMUGe9KR+nAtjGoPr36HJt4XfMcGy9q6D3SnNKA87yxJa1UjfRNQzKdd7NY4+NRuxnYl3phPGag1SQQ= +SHA256 (Pkgfile) = 1f627c5e49010e366ac52d467fc0e56c2e2d02a2ffb4c611acb91b77f0092b3b +SHA256 (.footprint) = 2978a94121487078efeeebce9ad0d7108a6d4823bfc4516e8ca22d8b502588b5 +SHA256 (man-db-2.10.0.tar.xz) = 0a8629022f7117dc7fc6473c6fdb14913b24b106059bb056abee87dbd6070c79 +SHA256 (man-db-2.10.0-fix-build-clang.patch) = 6b28ac046b3234087ef22283a9f66663df6ddfc27dfdfb00beb4d635420fd187 SHA256 (mandb.cron) = f2e9f1210bf6b7c3335cc6f3a9551651812428109ea8c4adc9cd5cf73461e0f1 diff --git a/man-db/Pkgfile b/man-db/Pkgfile index c0f526ee..3f994b44 100644 --- a/man-db/Pkgfile +++ b/man-db/Pkgfile @@ -1,17 +1,19 @@ # Description: An implementation of the standard Unix documentation system accessed using the man command -# URL: http://man-db.nongnu.org/ +# URL: https://man-db.nongnu.org/ # Maintainer: CRUX System Team, core-ports at crux dot nu # Depends on: zlib gdbm libpipeline name=man-db -version=2.9.4 +version=2.10.0 release=1 -source=(http://download.savannah.gnu.org/releases/$name/$name-$version.tar.xz \ - mandb.cron) +source=(https://download.savannah.gnu.org/releases/$name/$name-$version.tar.xz + $name-$version-fix-build-clang.patch mandb.cron) build() { cd $name-$version + patch -p1 -i $SRC/$name-$version-fix-build-clang.patch + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/man-db/man-db-2.10.0-fix-build-clang.patch b/man-db/man-db-2.10.0-fix-build-clang.patch new file mode 100644 index 00000000..28963010 --- /dev/null +++ b/man-db/man-db-2.10.0-fix-build-clang.patch @@ -0,0 +1,44 @@ +https://gitlab.com/cjwatson/man-db/-/commit/f4f94402834f20b9da730aeca5daa465... +https://gitlab.com/cjwatson/man-db/-/issues/2 + +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. +--- 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