Termux
/
termux-packages
mirror of https://github.com/termux/termux-packages
1
0
Fork 0
Code Issues Releases Wiki Activity

man: Bump to 1.14.6

This commit is contained in:
Tee KOBAYASHI 2022-09-28 08:57:08 +09:00 committed by xtkoba
parent 2f87d870a7
commit 755e472da2
9 changed files with 202 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/man/build.sh
View File

@ -1,16 +1,17 @@
TERMUX_PKG_HOMEPAGE=https://mdocml.bsd.lv/
TERMUX_PKG_DESCRIPTION="Man page viewer from the mandoc toolset"
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_LICENSE="ISC, BSD 2-Clause, BSD 3-Clause"
TERMUX_PKG_LICENSE_FILE="LICENSE"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.14.5
TERMUX_PKG_REVISION=3
TERMUX_PKG_VERSION=1.14.6
TERMUX_PKG_SRCURL=http://mdocml.bsd.lv/snapshots/mandoc-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=8219b42cb56fc07b2aa660574e6211ac38eefdbf21f41b698d3348793ba5d8f7
TERMUX_PKG_SHA256=8bf0d570f01e70a6e124884088870cbed7537f36328d512909eb10cd53179d9c
TERMUX_PKG_DEPENDS="less,libandroid-glob,zlib"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_RM_AFTER_INSTALL="share/examples"
termux_step_pre_configure() {
CPPFLAGS+=" -DBIONIC_IOCTL_NO_SIGNEDNESS_OVERLOAD"
LDFLAGS+=" -landroid-glob"
echo "PREFIX=\"$TERMUX_PREFIX\"" > configure.local
echo "CC=\"$CC\"" >> configure.local

44
packages/man/configure.patch
View File

@ -1,9 +1,8 @@
diff -u -r ../mandoc-1.14.5/configure ./configure
--- ../mandoc-1.14.5/configure 2019-03-10 09:56:43.000000000 +0000
+++ ./configure 2019-03-17 11:00:40.653234300 +0000
@@ -35,16 +35,13 @@
--- a/configure
+++ b/configure
@@ -35,18 +35,15 @@
SOURCEDIR=`dirname "$0"`
SOURCEDIR=`dirname "${0}"`
-MANPATH_BASE="/usr/share/man:/usr/X11R6/man"
-MANPATH_DEFAULT="/usr/share/man:/usr/X11R6/man:/usr/local/man"
@ -13,14 +12,25 @@ diff -u -r ../mandoc-1.14.5/configure ./configure
OSNAME=
UTF8_LOCALE=
-CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -`
AR=ar
-CC=cc
-CFLAGS=
FATAL=0
LDADD=
-LDFLAGS=
LD_NANOSLEEP=
LD_OHASH=
LD_RECVMSG=
@@ -126,7 +123,7 @@
@@ -121,7 +118,7 @@
BINM_MAN="man"
BINM_SOELIM="soelim"
BINM_WHATIS="whatis"
-BINM_PAGER=
+BINM_PAGER="less"
MANM_MAN="man"
MANM_MANCONF="man.conf"
MANM_MDOC="mdoc"
@@ -134,7 +131,7 @@
INSTALL_LIB=
INSTALL_MAN=
INSTALL_DATA=
@ -29,16 +39,16 @@ diff -u -r ../mandoc-1.14.5/configure ./configure
# --- manual settings from configure.local -----------------------------
@@ -367,7 +364,7 @@
elif singletest nanosleep NANOSLEEP; then
:
elif runtest nanosleep NANOSLEEP "-lrt"; then
- LD_NANOSLEEP="-lrt"
+ LD_NANOSLEEP=""
fi
if [ "${HAVE_NANOSLEEP}" -eq 0 ]; then
echo "FATAL: nanosleep: no" 1>&2
@@ -452,7 +449,7 @@
@@ -310,7 +307,7 @@
runtest isblank ISBLANK || true
runtest mkdtemp MKDTEMP || true
runtest mkstemps MKSTEMPS || true
-runtest nanosleep NANOSLEEP "${LD_NANOSLEEP}" "-lrt" || true
+runtest nanosleep NANOSLEEP "${LD_NANOSLEEP}" "" || true
runtest ntohl NTOHL || true
runtest O_DIRECTORY O_DIRECTORY || true
runtest PATH_MAX PATH_MAX || true
@@ -458,7 +455,7 @@
[ ${HAVE_GETLINE} -eq 0 ] && echo "#include <stdio.h>"
echo

113
packages/man/fix-hardcoded-paths-in-manpages.patch Normal file
View File

@ -0,0 +1,113 @@
--- a/apropos.1
+++ b/apropos.1
@@ -372,12 +372,12 @@
is specified.
.El
.Sh FILES
-.Bl -tag -width "/etc/man.conf" -compact
+.Bl -tag -width "@TERMUX_PREFIX@/etc/man.conf" -compact
.It Pa mandoc.db
name of the
.Xr makewhatis 8
keyword database
-.It Pa /etc/man.conf
+.It Pa @TERMUX_PREFIX@/etc/man.conf
default
.Xr man 1
configuration file
--- a/makewhatis.8
+++ b/makewhatis.8
@@ -154,7 +154,7 @@
A database of manpages relative to the directory of the file.
This file is portable across architectures and systems, so long as the
manpage hierarchy it indexes does not change.
-.It Pa /etc/man.conf
+.It Pa @TERMUX_PREFIX@/etc/man.conf
The default
.Xr man 1
configuration file.
--- a/man.1
+++ b/man.1
@@ -224,7 +224,7 @@
entries in the
.Xr man.conf 5
file, or with
-.Pa /usr/share/man : Ns Pa /usr/X11R6/man : Ns Pa /usr/local/man
+.Pa @TERMUX_PREFIX@/share/man
by default.
Within each of these, directories are searched in the order provided.
Within each directory, the search proceeds according to the following
@@ -333,8 +333,8 @@
is used.
.El
.Sh FILES
-.Bl -tag -width /etc/man.conf -compact
-.It Pa /etc/man.conf
+.Bl -tag -width @TERMUX_PREFIX@/etc/man.conf -compact
+.It Pa @TERMUX_PREFIX@/etc/man.conf
default
.Nm
configuration file
--- a/man.conf.5
+++ b/man.conf.5
@@ -104,7 +104,7 @@
.El
.Sh FILES
.Bl -tag -width /etc/examples/man.conf -compact
-.It Pa /etc/man.conf
+.It Pa @TERMUX_PREFIX@/etc/man.conf
.El
.Sh EXAMPLES
The following configuration file reproduces the defaults:
@@ -112,9 +112,7 @@
.Nm
file at all.
.Bd -literal -offset indent
-manpath /usr/share/man
-manpath /usr/X11R6/man
-manpath /usr/local/man
+manpath @TERMUX_PREFIX@/share/man
.Ed
.Sh SEE ALSO
.Xr apropos 1 ,
--- a/mandoc.1
+++ b/mandoc.1
@@ -1016,7 +1016,7 @@
When running with
.Fl W Cm base ,
the search is restricted to the base system, by default to
-.Pa /usr/share/man : Ns Pa /usr/X11R6/man .
+.Pa @TERMUX_PREFIX@/share/man .
This path can be configured at compile time using the
.Dv MANPATH_BASE
preprocessor macro.
@@ -1033,7 +1033,7 @@
environment variable, the
.Xr man.conf 5
file and falling back to the default of
-.Pa /usr/share/man : Ns Pa /usr/X11R6/man : Ns Pa /usr/local/man ,
+.Pa @TERMUX_PREFIX@/share/man ,
also configurable at compile time using the
.Dv MANPATH_DEFAULT
preprocessor macro.
--- a/mandoc.db.5
+++ b/mandoc.db.5
@@ -186,16 +186,9 @@
followed by the number 0.
.El
.Sh FILES
-.Bl -tag -width /usr/share/man/mandoc.db -compact
-.It Pa /usr/share/man/mandoc.db
+.Bl -tag -width @TERMUX_PREFIX@/share/man/mandoc.db -compact
+.It Pa @TERMUX_PREFIX@/share/man/mandoc.db
The manual page database for the base system.
-.It Pa /usr/X11R6/man/mandoc.db
-The same for the
-.Xr X 7
-Window System.
-.It Pa /usr/local/man/mandoc.db
-The same for
-.Xr packages 7 .
.El
.Pp
A program to dump

12
packages/man/main.c.patch
View File

@ -1,12 +0,0 @@
diff -u -r ../mandoc-1.14.4/main.c ./main.c
--- ../mandoc-1.14.4/main.c 2018-08-08 14:51:51.000000000 +0000
+++ ./main.c 2018-08-11 09:58:01.245684598 +0000
@@ -1187,7 +1187,7 @@
if (pager == NULL || *pager == '\0')
pager = getenv("PAGER");
if (pager == NULL || *pager == '\0')
- pager = "more -s";
+ pager = "less -s";
cp = mandoc_strdup(pager);
/*

16
packages/man/mandocdb.c.patch
View File

@ -1,7 +1,15 @@
diff -uNr mandoc-1.14.3/mandocdb.c mandoc-1.14.3.mod/mandocdb.c
--- mandoc-1.14.3/mandocdb.c 2017-08-05 15:40:22.000000000 +0300
+++ mandoc-1.14.3.mod/mandocdb.c 2017-09-14 14:33:07.342860405 +0300
@@ -2154,7 +2154,7 @@
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -2203,7 +2203,7 @@
dbwrite(struct dba *dba)
{
struct stat sb1, sb2;
- char tfn[33], *cp1, *cp2;
+ char tfn[sizeof("@TERMUX_PREFIX@/tmp/mandocdb.XXXXXXXX")], *cp1, *cp2;
off_t i;
int fd1, fd2;
@@ -2238,7 +2238,7 @@
* file, but let's at least check whether the data changed.
*/

15
packages/man/tag.c.patch
View File

@ -1,15 +0,0 @@
diff -u -r ../mdocml-1.13.4/tag.c ./tag.c
--- ../mdocml-1.13.4/tag.c 2016-07-14 07:13:40.000000000 -0400
+++ ./tag.c 2016-07-16 19:03:04.023051008 -0400
@@ -82,9 +82,9 @@
/* Create both temporary output files. */
- (void)strlcpy(tag_files.ofn, "/tmp/man.XXXXXXXXXX",
+ (void)strlcpy(tag_files.ofn, "@TERMUX_PREFIX@/tmp/man.XXXXXXXXXX",
sizeof(tag_files.ofn));
- (void)strlcpy(tag_files.tfn, "/tmp/man.XXXXXXXXXX",
+ (void)strlcpy(tag_files.tfn, "@TERMUX_PREFIX@/tmp/man.XXXXXXXXXX",
sizeof(tag_files.tfn));
if ((ofd = mkstemp(tag_files.ofn)) == -1)
goto fail;

14
packages/man/tag.h.patch
View File

@ -1,14 +0,0 @@
diff -u -r ../mandoc-1.14.5/tag.h ./tag.h
--- ../mandoc-1.14.5/tag.h 2019-03-10 09:56:43.000000000 +0000
+++ ./tag.h 2019-03-17 11:02:57.271630396 +0000
@@ -16,8 +16,8 @@
*/
struct tag_files {
- char ofn[20];
- char tfn[20];
+ char ofn[127];
+ char tfn[127];
char *tagname;
int ofd;
int tfd;

34
packages/man/term_tag.c.patch Normal file
View File

@ -0,0 +1,34 @@
--- a/term_tag.c
+++ b/term_tag.c
@@ -87,7 +87,7 @@
if (outfilename == NULL) {
(void)snprintf(tag_files.ofn, sizeof(tag_files.ofn),
- "/tmp/man.XXXXXXXXXX%s", suffix);
+ "@TERMUX_PREFIX@/tmp/man.XXXXXXXXXX%s", suffix);
if ((ofd = mkstemps(tag_files.ofn, strlen(suffix))) == -1) {
mandoc_msg(MANDOCERR_MKSTEMP, 0, 0,
"%s: %s", tag_files.ofn, strerror(errno));
@@ -105,7 +105,7 @@
}
}
if (tagfilename == NULL) {
- (void)strlcpy(tag_files.tfn, "/tmp/man.XXXXXXXXXX",
+ (void)strlcpy(tag_files.tfn, "@TERMUX_PREFIX@/tmp/man.XXXXXXXXXX",
sizeof(tag_files.tfn));
if ((tfd = mkstemp(tag_files.tfn)) == -1) {
mandoc_msg(MANDOCERR_MKSTEMP, 0, 0,
@@ -201,11 +201,11 @@
getpgid(tc_pgid) == -1)
(void)tcsetpgrp(STDOUT_FILENO, tag_files.tcpgid);
}
- if (strncmp(tag_files.ofn, "/tmp/man.", 9) == 0) {
+ if (strncmp(tag_files.ofn, "@TERMUX_PREFIX@/tmp/man.", 9) == 0) {
unlink(tag_files.ofn);
*tag_files.ofn = '\0';
}
- if (strncmp(tag_files.tfn, "/tmp/man.", 9) == 0) {
+ if (strncmp(tag_files.tfn, "@TERMUX_PREFIX@/tmp/man.", 9) == 0) {
unlink(tag_files.tfn);
*tag_files.tfn = '\0';
}

11
packages/man/term_tag.h.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/term_tag.h
+++ b/term_tag.h
@@ -18,6 +18,8 @@
* For use by the mandoc(1) ASCII and UTF-8 formatters only.
*/
+_Static_assert(sizeof("@TERMUX_PREFIX@/tmp/man.XXXXXXXXXX.html") <= 80, "tmpfile name too long");
+
struct tag_files {
char ofn[80]; /* Output file name. */
char tfn[80]; /* Tag file name. */