diff options
author | Brian Callahan <bcallah@openbsd.org> | 2020-01-25 21:20:39 -0500 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2020-01-26 09:10:37 +0100 |
commit | 78ddf2e0489d2944f5bbb05c9c924bb97fed9b34 (patch) | |
tree | 1c6041c9a52c8030fbccd5d32cdc0eb60c8ee3d0 /Ports | |
parent | 77ed9432758fe11cb187816264b444f6318df270 (diff) | |
download | serenity-78ddf2e0489d2944f5bbb05c9c924bb97fed9b34.zip |
Ports: Add mandoc port
Diffstat (limited to 'Ports')
-rwxr-xr-x | Ports/mandoc/package.sh | 6 | ||||
-rw-r--r-- | Ports/mandoc/patches/add-charclass.patch | 32 | ||||
-rw-r--r-- | Ports/mandoc/patches/add-compat_glob.patch | 1177 | ||||
-rw-r--r-- | Ports/mandoc/patches/add-glob.patch | 118 | ||||
-rw-r--r-- | Ports/mandoc/patches/fix-Makefile.patch | 18 | ||||
-rw-r--r-- | Ports/mandoc/patches/fix-catman.patch | 11 | ||||
-rw-r--r-- | Ports/mandoc/patches/fix-configure.patch | 92 | ||||
-rw-r--r-- | Ports/mandoc/patches/fix-dba-read.patch | 11 | ||||
-rw-r--r-- | Ports/mandoc/patches/fix-dbm-map.patch | 11 | ||||
-rw-r--r-- | Ports/mandoc/patches/fix-dbm.patch | 11 | ||||
-rw-r--r-- | Ports/mandoc/patches/fix-demandoc.patch | 10 | ||||
-rw-r--r-- | Ports/mandoc/patches/fix-main.patch | 43 | ||||
-rw-r--r-- | Ports/mandoc/patches/fix-mandocdb.patch | 10 | ||||
-rw-r--r-- | Ports/mandoc/patches/fix-mansearch.patch | 14 | ||||
-rw-r--r-- | Ports/mandoc/patches/fix-soelim.patch | 10 |
15 files changed, 1574 insertions, 0 deletions
diff --git a/Ports/mandoc/package.sh b/Ports/mandoc/package.sh new file mode 100755 index 0000000000..bd43405d93 --- /dev/null +++ b/Ports/mandoc/package.sh @@ -0,0 +1,6 @@ +#!/bin/bash ../.port_include.sh +port=mandoc +version=1.14.5 +useconfigure=true +files="https://mandoc.bsd.lv/snapshots/mandoc-1.14.5.tar.gz mandoc-1.14.5.tar.gz" +depends="less pcre2 zlib" diff --git a/Ports/mandoc/patches/add-charclass.patch b/Ports/mandoc/patches/add-charclass.patch new file mode 100644 index 0000000000..9c71a534fe --- /dev/null +++ b/Ports/mandoc/patches/add-charclass.patch @@ -0,0 +1,32 @@ +--- /dev/null Mon Jan 20 00:15:16 2020 ++++ mandoc-1.14.5/charclass.h Mon Jan 20 00:15:04 2020 +@@ -0,0 +1,29 @@ ++/* ++ * Public domain, 2008, Todd C. Miller <millert@openbsd.org> ++ * ++ * $OpenBSD: charclass.h,v 1.2 2019/01/25 00:19:25 millert Exp $ ++ */ ++ ++/* ++ * POSIX character class support for fnmatch() and glob(). ++ */ ++static struct cclass { ++ const char *name; ++ int (*isctype)(int); ++} cclasses[] = { ++ { "alnum", isalnum }, ++ { "alpha", isalpha }, ++ { "blank", isblank }, ++ { "cntrl", iscntrl }, ++ { "digit", isdigit }, ++ { "graph", isgraph }, ++ { "lower", islower }, ++ { "print", isprint }, ++ { "punct", ispunct }, ++ { "space", isspace }, ++ { "upper", isupper }, ++ { "xdigit", isxdigit }, ++ { NULL, NULL } ++}; ++ ++#define NCCLASSES (sizeof(cclasses) / sizeof(cclasses[0]) - 1) diff --git a/Ports/mandoc/patches/add-compat_glob.patch b/Ports/mandoc/patches/add-compat_glob.patch new file mode 100644 index 0000000000..b9f5bb18cb --- /dev/null +++ b/Ports/mandoc/patches/add-compat_glob.patch @@ -0,0 +1,1177 @@ +--- mandoc-1.14.5/compat_glob.c.orig Sat Jan 25 20:23:13 2020 ++++ mandoc-1.14.5/compat_glob.c Sat Jan 25 20:22:56 2020 +@@ -0,0 +1,1174 @@ ++/* $NetBSD: glob.c,v 1.39 2019/05/29 01:21:33 christos Exp $ */ ++ ++/* ++ * Copyright (c) 1989, 1993 ++ * The Regents of the University of California. All rights reserved. ++ * ++ * This code is derived from software contributed to Berkeley by ++ * Guido van Rossum. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. Neither the name of the University nor the names of its contributors ++ * may be used to endorse or promote products derived from this software ++ * without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE ++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ * SUCH DAMAGE. ++ */ ++ ++#include <sys/cdefs.h> ++#if defined(LIBC_SCCS) && !defined(lint) ++#if 0 ++static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; ++#else ++__RCSID("$NetBSD: glob.c,v 1.39 2019/05/29 01:21:33 christos Exp $"); ++#endif ++#endif /* LIBC_SCCS and not lint */ ++ ++/* ++ * glob(3) -- a superset of the one defined in POSIX 1003.2. ++ * ++ * The [!...] convention to negate a range is supported (SysV, Posix, ksh). ++ * ++ * Optional extra services, controlled by flags not defined by POSIX: ++ * ++ * GLOB_MAGCHAR: ++ * Set in gl_flags if pattern contained a globbing character. ++ * GLOB_NOMAGIC: ++ * Same as GLOB_NOCHECK, but it will only append pattern if it did ++ * not contain any magic characters. [Used in csh style globbing] ++ * GLOB_ALTDIRFUNC: ++ * Use alternately specified directory access functions. ++ * GLOB_TILDE: ++ * expand ~user/foo to the /home/dir/of/user/foo ++ * GLOB_BRACE: ++ * expand {1,2}{a,b} to 1a 1b 2a 2b ++ * GLOB_PERIOD: ++ * allow metacharacters to match leading dots in filenames. ++ * GLOB_NO_DOTDIRS: ++ * . and .. are hidden from wildcards, even if GLOB_PERIOD is set. ++ * gl_matchc: ++ * Number of matches in the current invocation of glob. ++ */ ++ ++#include <sys/param.h> ++#include <sys/stat.h> ++ ++#include <assert.h> ++#include <ctype.h> ++#include <dirent.h> ++#include <errno.h> ++#include <pwd.h> ++#include <stdio.h> ++#include <stddef.h> ++#include <stdlib.h> ++#include <string.h> ++#include <unistd.h> ++ ++#include "glob.h" ++ ++#define NO_GETPW_R ++ ++#define GLOB_LIMIT_STRING 524288 /* number of readdirs */ ++#define GLOB_LIMIT_STAT 128 /* number of stat system calls */ ++#define GLOB_LIMIT_READDIR 65536 /* total buffer size of path strings */ ++#define GLOB_LIMIT_PATH 1024 /* number of path elements */ ++#define GLOB_LIMIT_BRACE 128 /* Number of brace calls */ ++ ++struct glob_limit { ++ size_t l_string; ++ size_t l_stat; ++ size_t l_readdir; ++ size_t l_brace; ++}; ++ ++/* ++ * XXX: For NetBSD 1.4.x compatibility. (kill me l8r) ++ */ ++#ifndef _DIAGASSERT ++#define _DIAGASSERT(a) ++#endif ++ ++#define DOLLAR '$' ++#define DOT '.' ++#define EOS '\0' ++#define LBRACKET '[' ++#define NOT '!' ++#define QUESTION '?' ++#define QUOTE '\\' ++#define RANGE '-' ++#define RBRACKET ']' ++#define SEP '/' ++#define STAR '*' ++#define TILDE '~' ++#define UNDERSCORE '_' ++#define LBRACE '{' ++#define RBRACE '}' ++#define SLASH '/' ++#define COMMA ',' ++ ++#ifndef USE_8BIT_CHARS ++ ++#define M_QUOTE 0x8000 ++#define M_PROTECT 0x4000 ++#define M_MASK 0xffff ++#define M_ASCII 0x00ff ++ ++typedef unsigned short Char; ++ ++#else ++ ++#define M_QUOTE (Char)0x80 ++#define M_PROTECT (Char)0x40 ++#define M_MASK (Char)0xff ++#define M_ASCII (Char)0x7f ++ ++typedef char Char; ++ ++#endif ++ ++ ++#define CHAR(c) ((Char)((c)&M_ASCII)) ++#define META(c) ((Char)((c)|M_QUOTE)) ++#define M_ALL META('*') ++#define M_END META(']') ++#define M_NOT META('!') ++#define M_ONE META('?') ++#define M_RNG META('-') ++#define M_SET META('[') ++#define ismeta(c) (((c)&M_QUOTE) != 0) ++ ++ ++static int compare(const void *, const void *); ++static int g_Ctoc(const Char *, char *, size_t); ++static int g_lstat(Char *, __gl_stat_t *, glob_t *); ++static DIR *g_opendir(Char *, glob_t *); ++static Char *g_strchr(const Char *, int); ++static int g_stat(Char *, __gl_stat_t *, glob_t *); ++static int glob0(const Char *, glob_t *, struct glob_limit *); ++static int glob1(Char *, glob_t *, struct glob_limit *); ++static int glob2(Char *, Char *, Char *, const Char *, glob_t *, ++ struct glob_limit *); ++static int glob3(Char *, Char *, Char *, const Char *, const Char *, ++ const Char *, glob_t *, struct glob_limit *); ++static int globextend(const Char *, glob_t *, struct glob_limit *); ++static int globtilde(const Char **, const Char *, Char *, size_t, ++ glob_t *); ++static int globexp1(const Char *, glob_t *, struct glob_limit *); ++static int globexp2(const Char *, const Char *, glob_t *, int *, ++ struct glob_limit *); ++static int match(const Char *, const Char *, const Char *); ++#ifdef DEBUG ++static void qprintf(const char *, Char *); ++#endif ++ ++#ifndef MAXPATHLEN ++#define MAXPATHLEN 1024 ++#endif ++ ++#ifndef __UNCONST ++#define __UNCONST(a) ((void*)(const void*)a) ++#endif ++ ++int ++glob(const char * __restrict pattern, int flags, int (*errfunc)(const char *, ++ int), glob_t * __restrict pglob) ++{ ++ const unsigned char *patnext; ++ int c; ++ Char *bufnext, *bufend, patbuf[MAXPATHLEN+1]; ++ struct glob_limit limit = { 0, 0, 0, 0 }; ++ ++ _DIAGASSERT(pattern != NULL); ++ ++ patnext = (const unsigned char *) pattern; ++ if (!(flags & GLOB_APPEND)) { ++ pglob->gl_pathc = 0; ++ pglob->gl_pathv = NULL; ++ if (!(flags & GLOB_DOOFFS)) ++ pglob->gl_offs = 0; ++ } ++ pglob->gl_flags = flags & ~GLOB_MAGCHAR; ++ pglob->gl_errfunc = errfunc; ++ pglob->gl_matchc = 0; ++ ++ bufnext = patbuf; ++ bufend = bufnext + MAXPATHLEN; ++ if (flags & GLOB_NOESCAPE) { ++ while (bufnext < bufend && (c = *patnext++) != EOS) ++ *bufnext++ = c; ++ } else { ++ /* Protect the quoted characters. */ ++ while (bufnext < bufend && (c = *patnext++) != EOS) ++ if (c == QUOTE) { ++ if ((c = *patnext++) == EOS) { ++ c = QUOTE; ++ --patnext; ++ } ++ *bufnext++ = c | M_PROTECT; ++ } ++ else ++ *bufnext++ = c; ++ } ++ *bufnext = EOS; ++ ++ if (flags & GLOB_BRACE) ++ return globexp1(patbuf, pglob, &limit); ++ else ++ return glob0(patbuf, pglob, &limit); ++} ++ ++/* ++ * Expand recursively a glob {} pattern. When there is no more expansion ++ * invoke the standard globbing routine to glob the rest of the magic ++ * characters ++ */ ++static int ++globexp1(const Char *pattern, glob_t *pglob, struct glob_limit *limit) ++{ ++ const Char* ptr = pattern; ++ int rv; ++ ++ _DIAGASSERT(pattern != NULL); ++ _DIAGASSERT(pglob != NULL); ++ ++ if ((pglob->gl_flags & GLOB_LIMIT) && ++ limit->l_brace++ >= GLOB_LIMIT_BRACE) { ++ errno = 0; ++ return GLOB_NOSPACE; ++ } ++ ++ /* Protect a single {}, for find(1), like csh */ ++ if (pattern[0] == LBRACE && pattern[1] == RBRACE && pattern[2] == EOS) ++ return glob0(pattern, pglob, limit); ++ ++ while ((ptr = (const Char *) g_strchr(ptr, LBRACE)) != NULL) ++ if (!globexp2(ptr, pattern, pglob, &rv, limit)) ++ return rv; ++ ++ return glob0(pattern, pglob, limit); ++} ++ ++ ++/* ++ * Recursive brace globbing helper. Tries to expand a single brace. ++ * If it succeeds then it invokes globexp1 with the new pattern. ++ * If it fails then it tries to glob the rest of the pattern and returns. ++ */ ++static int ++globexp2(const Char *ptr, const Char *pattern, glob_t *pglob, int *rv, ++ struct glob_limit *limit) ++{ ++ int i; ++ Char *lm, *ls; ++ const Char *pe, *pm, *pl; ++ Char patbuf[MAXPATHLEN + 1]; ++ ++ _DIAGASSERT(ptr != NULL); ++ _DIAGASSERT(pattern != NULL); ++ _DIAGASSERT(pglob != NULL); ++ _DIAGASSERT(rv != NULL); ++ ++ /* copy part up to the brace */ ++ for (lm = patbuf, pm = pattern; pm != ptr; *lm++ = *pm++) ++ continue; ++ ls = lm; ++ ++ /* Find the balanced brace */ ++ for (i = 0, pe = ++ptr; *pe; pe++) ++ if (*pe == LBRACKET) { ++ /* Ignore everything between [] */ ++ for (pm = pe++; *pe != RBRACKET && *pe != EOS; pe++) ++ continue; ++ if (*pe == EOS) { ++ /* ++ * We could not find a matching RBRACKET. ++ * Ignore and just look for RBRACE ++ */ ++ pe = pm; ++ } ++ } ++ else if (*pe == LBRACE) ++ i++; ++ else if (*pe == RBRACE) { ++ if (i == 0) ++ break; ++ i--; ++ } ++ ++ /* Non matching braces; just glob the pattern */ ++ if (i != 0 || *pe == EOS) { ++ /* ++ * we use `pattern', not `patbuf' here so that that ++ * unbalanced braces are passed to the match ++ */ ++ *rv = glob0(pattern, pglob, limit); ++ return 0; ++ } ++ ++ for (i = 0, pl = pm = ptr; pm <= pe; pm++) { ++ switch (*pm) { ++ case LBRACKET: ++ /* Ignore everything between [] */ ++ for (pl = pm++; *pm != RBRACKET && *pm != EOS; pm++) ++ continue; ++ if (*pm == EOS) { ++ /* ++ * We could not find a matching RBRACKET. ++ * Ignore and just look for RBRACE ++ */ ++ pm = pl; ++ } ++ break; ++ ++ case LBRACE: ++ i++; ++ break; ++ ++ case RBRACE: ++ if (i) { ++ i--; ++ break; ++ } ++ /* FALLTHROUGH */ ++ case COMMA: ++ if (i && *pm == COMMA) ++ break; ++ else { ++ /* Append the current string */ ++ for (lm = ls; (pl < pm); *lm++ = *pl++) ++ continue; ++ /* ++ * Append the rest of the pattern after the ++ * closing brace ++ */ ++ for (pl = pe + 1; (*lm++ = *pl++) != EOS;) ++ continue; ++ ++ /* Expand the current pattern */ ++#ifdef DEBUG ++ qprintf("globexp2", patbuf); ++#endif ++ *rv = globexp1(patbuf, pglob, limit); ++ ++ /* move after the comma, to the next string */ ++ pl = pm + 1; ++ } ++ break; ++ ++ default: ++ break; ++ } ++ } ++ *rv = 0; ++ return 0; ++} ++ ++ ++ ++/* ++ * expand tilde from the passwd file. ++ */ ++static int ++globtilde(const Char **qpatnext, const Char *pattern, Char *patbuf, ++ size_t patsize, glob_t *pglob) ++{ ++ struct passwd *pwd; ++ const char *h; ++ const Char *p; ++ Char *b; ++ char *d; ++ Char *pend = &patbuf[patsize / sizeof(Char)]; ++#ifndef NO_GETPW_R ++ struct passwd pwres; ++ char pwbuf[1024]; ++#endif ++ ++ pend--; ++ ++ _DIAGASSERT(pattern != NULL); ++ _DIAGASSERT(patbuf != NULL); ++ _DIAGASSERT(pglob != NULL); ++ *qpatnext = pattern; ++ ++ if (*pattern != TILDE || !(pglob->gl_flags & GLOB_TILDE)) ++ return 0; ++ ++ /* Copy up to the end of the string or / */ ++ for (p = pattern + 1, d = (char *)(void *)patbuf; ++ d < (char *)(void *)pend && *p && *p != SLASH; ++ *d++ = *p++) ++ continue; ++ ++ if (d == (char *)(void *)pend) ++ return GLOB_ABEND; ++ ++ *d = EOS; ++ d = (char *)(void *)patbuf; ++ ++ if (*d == EOS) { ++ /* ++ * handle a plain ~ or ~/ by expanding $HOME ++ * first and then trying the password file ++ */ ++ if ((h = getenv("HOME")) == NULL) { ++#ifdef NO_GETPW_R ++ if ((pwd = getpwuid(getuid())) == NULL) ++#else ++ if (getpwuid_r(getuid(), &pwres, pwbuf, sizeof(pwbuf), ++ &pwd) != 0 || pwd == NULL) ++#endif ++ goto nouser; ++ h = pwd->pw_dir; ++ } ++ } ++ else { ++ /* ++ * Expand a ~user ++ */ ++#ifdef NO_GETPW_R ++ if ((pwd = getpwnam(d)) == NULL) ++#else ++ if (getpwnam_r(d, &pwres, pwbuf, sizeof(pwbuf), &pwd) != 0 || ++ pwd == NULL) ++#endif ++ goto nouser; ++ h = pwd->pw_dir; ++ } ++ ++ /* Copy the home directory */ ++ for (b = patbuf; b < pend && *h; *b++ = *h++) ++ continue; ++ ++ if (b == pend) ++ return GLOB_ABEND; ++ ++ /* Append the rest of the pattern */ ++ while (b < pend && (*b++ = *p++) != EOS) ++ continue; ++ ++ if (b == pend) ++ return GLOB_ABEND; ++ ++ *qpatnext = patbuf; ++ return 0; ++nouser: ++ return (pglob->gl_flags & GLOB_TILDE_CHECK) ? GLOB_NOMATCH : 0; ++} ++ ++ ++/* ++ * The main glob() routine: compiles the pattern (optionally processing ++ * quotes), calls glob1() to do the real pattern matching, and finally ++ * sorts the list (unless unsorted operation is requested). Returns 0 ++ * if things went well, nonzero if errors occurred. It is not an error ++ * to find no matches. ++ */ ++static int ++glob0(const Char *pattern, glob_t *pglob, struct glob_limit *limit) ++{ ++ const Char *qpatnext; ++ int c, error; ++ __gl_size_t oldpathc; ++ Char *bufnext, patbuf[MAXPATHLEN+1]; ++ ++ _DIAGASSERT(pattern != NULL); ++ _DIAGASSERT(pglob != NULL); ++ ++ if ((error = globtilde(&qpatnext, pattern, patbuf, sizeof(patbuf), ++ pglob)) != 0) ++ return error; ++ oldpathc = pglob->gl_pathc; ++ bufnext = patbuf; ++ ++ /* We don't need to check for buffer overflow any more. */ ++ while ((c = *qpatnext++) != EOS) { ++ switch (c) { ++ case LBRACKET: ++ c = *qpatnext; ++ if (c == NOT) ++ ++qpatnext; ++ if (*qpatnext == EOS || ++ g_strchr(qpatnext+1, RBRACKET) == NULL) { ++ *bufnext++ = LBRACKET; ++ if (c == NOT) ++ --qpatnext; ++ break; ++ } ++ *bufnext++ = M_SET; ++ if (c == NOT) ++ *bufnext++ = M_NOT; ++ c = *qpatnext++; ++ do { ++ *bufnext++ = CHAR(c); ++ if (*qpatnext == RANGE && ++ (c = qpatnext[1]) != RBRACKET) { ++ *bufnext++ = M_RNG; ++ *bufnext++ = CHAR(c); ++ qpatnext += 2; ++ } ++ } while ((c = *qpatnext++) != RBRACKET); ++ pglob->gl_flags |= GLOB_MAGCHAR; ++ *bufnext++ = M_END; ++ break; ++ case QUESTION: ++ pglob->gl_flags |= GLOB_MAGCHAR; ++ *bufnext++ = M_ONE; ++ break; ++ case STAR: ++ pglob->gl_flags |= GLOB_MAGCHAR; ++ /* collapse adjacent stars to one [or three if globstar] ++ * to avoid exponential behavior ++ */ ++ if (bufnext == patbuf || bufnext[-1] != M_ALL || ++ ((pglob->gl_flags & GLOB_STAR) != 0 && ++ (bufnext - 1 == patbuf || bufnext[-2] != M_ALL || ++ bufnext - 2 == patbuf || bufnext[-3] != M_ALL))) ++ *bufnext++ = M_ALL; ++ break; ++ default: ++ *bufnext++ = CHAR(c); ++ break; ++ } ++ } ++ *bufnext = EOS; ++#ifdef DEBUG ++ qprintf("glob0", patbuf); ++#endif ++ ++ if ((error = glob1(patbuf, pglob, limit)) != 0) ++ return error; ++ ++ if (pglob->gl_pathc == oldpathc) { ++ /* ++ * If there was no match we are going to append the pattern ++ * if GLOB_NOCHECK was specified or if GLOB_NOMAGIC was ++ * specified and the pattern did not contain any magic ++ * characters GLOB_NOMAGIC is there just for compatibility ++ * with csh. ++ */ ++ if ((pglob->gl_flags & GLOB_NOCHECK) || ++ ((pglob->gl_flags & (GLOB_NOMAGIC|GLOB_MAGCHAR)) ++ == GLOB_NOMAGIC)) { ++ return globextend(pattern, pglob, limit); ++ } else { ++ return GLOB_NOMATCH; ++ } ++ } else if (!(pglob->gl_flags & GLOB_NOSORT)) { ++ qsort(pglob->gl_pathv + pglob->gl_offs + oldpathc, ++ (size_t)pglob->gl_pathc - oldpathc, sizeof(char *), ++ compare); ++ } ++ ++ return 0; ++} ++ ++static int ++compare(const void *p, const void *q) ++{ ++ ++ _DIAGASSERT(p != NULL); ++ _DIAGASSERT(q != NULL); ++ ++ return strcoll(*(const char * const *)p, *(const char * const *)q); ++} ++ ++static int ++glob1(Char *pattern, glob_t *pglob, struct glob_limit *limit) ++{ ++ Char pathbuf[MAXPATHLEN+1]; ++ ++ _DIAGASSERT(pattern != NULL); ++ _DIAGASSERT(pglob != NULL); ++ ++ /* A null pathname is invalid -- POSIX 1003.1 sect. 2.4. */ ++ if (*pattern == EOS) ++ return 0; ++ /* ++ * we save one character so that we can use ptr >= limit, ++ * in the general case when we are appending non nul chars only. ++ */ ++ return glob2(pathbuf, pathbuf, ++ pathbuf + (sizeof(pathbuf) / sizeof(*pathbuf)) - 1, pattern, ++ pglob, limit); ++} ++ ++/* ++ * The functions glob2 and glob3 are mutually recursive; there is one level ++ * of recursion for each segment in the pattern that contains one or more ++ * meta characters. ++ */ ++static int ++glob2(Char *pathbuf, Char *pathend, Char *pathlim, const Char *pattern, ++ glob_t *pglob, struct glob_limit *limit) ++{ ++ __gl_stat_t sb; ++ const Char *p; ++ Char *q; ++ int anymeta; ++ ++ _DIAGASSERT(pathbuf != NULL); ++ _DIAGASSERT(pathend != NULL); ++ _DIAGASSERT(pattern != NULL); ++ _DIAGASSERT(pglob != NULL); ++ ++#ifdef DEBUG ++ qprintf("glob2", pathbuf); ++#endif ++ /* ++ * Loop over pattern segments until end of pattern or until ++ * segment with meta character found. ++ */ ++ for (anymeta = 0;;) { ++ if (*pattern == EOS) { /* End of pattern? */ ++ *pathend = EOS; ++ if (g_lstat(pathbuf, &sb, pglob)) ++ return 0; ++ ++ if ((pglob->gl_flags & GLOB_LIMIT) && ++ limit->l_stat++ >= GLOB_LIMIT_STAT) { ++ errno = 0; ++ *pathend++ = SEP; ++ *pathend = EOS; ++ return GLOB_NOSPACE; ++ } ++ if (((pglob->gl_flags & GLOB_MARK) && ++ pathend[-1] != SEP) && (S_ISDIR(sb.st_mode) || ++ (S_ISLNK(sb.st_mode) && ++ (g_stat(pathbuf, &sb, pglob) == 0) && ++ S_ISDIR(sb.st_mode)))) { ++ if (pathend >= pathlim) ++ return GLOB_ABORTED; ++ *pathend++ = SEP; ++ *pathend = EOS; ++ } ++ ++pglob->gl_matchc; ++ return globextend(pathbuf, pglob, limit); ++ } ++ ++ /* Find end of next segment, copy tentatively to pathend. */ ++ q = pathend; ++ p = pattern; ++ while (*p != EOS && *p != SEP) { ++ if (ismeta(*p)) ++ anymeta = 1; ++ if (q >= pathlim) ++ return GLOB_ABORTED; ++ *q++ = *p++; ++ } ++ ++ if (!anymeta) { ++ pathend = q; ++ pattern = p; ++ while (*pattern == SEP) { ++ if (pathend >= pathlim) ++ return GLOB_ABORTED; ++ *pathend++ = *pattern++; ++ } ++ } else /* Need expansion, recurse. */ ++ return glob3(pathbuf, pathend, pathlim, pattern, p, ++ pattern, pglob, limit); ++ } ++ /* NOTREACHED */ ++} ++ ++static int ++glob3(Char *pathbuf, Char *pathend, Char *pathlim, const Char *pattern, ++ const Char *restpattern, const Char *pglobstar, glob_t *pglob, ++ struct glob_limit *limit) ++{ ++ struct dirent *dp; ++ DIR *dirp; ++ __gl_stat_t sbuf; ++ int error; ++ char buf[MAXPATHLEN]; ++ int globstar = 0; ++ int chase_symlinks = 0; ++ const Char *termstar = NULL; ++ ++ /* ++ * The readdirfunc declaration can't be prototyped, because it is ++ * assigned, below, to two functions which are prototyped in glob.h ++ * and dirent.h as taking pointers to differently typed opaque ++ * structures. ++ */ ++ struct dirent *(*readdirfunc)(void *); ++ ++ _DIAGASSERT(pathbuf != NULL); ++ _DIAGASSERT(pathend != NULL); ++ _DIAGASSERT(pattern != NULL); ++ _DIAGASSERT(restpattern != NULL); ++ _DIAGASSERT(pglob != NULL); ++ ++ *pathend = EOS; ++ errno = 0; ++ ++ while (pglobstar < restpattern) { ++ if ((pglobstar[0] & M_MASK) == M_ALL && ++ (pglobstar[1] & M_MASK) == M_ALL) { ++ globstar = 1; ++ chase_symlinks = (pglobstar[2] & M_MASK) == M_ALL; ++ termstar = pglobstar + (2 + chase_symlinks); ++ break; ++ } ++ pglobstar++; ++ } ++ ++ if (globstar) { ++ error = pglobstar == pattern && termstar == restpattern ? ++ *restpattern == EOS ? ++ glob2(pathbuf, pathend, pathlim, restpattern - 1, pglob, ++ limit) : ++ glob2(pathbuf, pathend, pathlim, restpattern + 1, pglob, ++ limit) : ++ glob3(pathbuf, pathend, pathlim, pattern, restpattern, ++ termstar, pglob, limit); ++ if (error) ++ return error; ++ *pathend = EOS; ++ } ++ ++ if (*pathbuf && (g_lstat(pathbuf, &sbuf, pglob) || ++ !S_ISDIR(sbuf.st_mode) ++#ifdef S_IFLINK ++ && ((globstar && !chase_symlinks) || !S_ISLNK(sbuf.st_mode)) ++#endif ++ )) ++ return 0; ++ ++ if ((dirp = g_opendir(pathbuf, pglob)) == NULL) { ++ if (pglob->gl_errfunc) { ++ if (g_Ctoc(pathbuf, buf, sizeof(buf))) ++ return GLOB_ABORTED; ++ if (pglob->gl_errfunc(buf, errno) || ++ pglob->gl_flags & GLOB_ERR) ++ return GLOB_ABORTED; ++ } ++ /* ++ * Posix/XOpen: glob should return when it encounters a ++ * directory that it cannot open or read ++ * XXX: Should we ignore ENOTDIR and ENOENT though? ++ * I think that Posix had in mind EPERM... ++ */ ++ if (pglob->gl_flags & GLOB_ERR) ++ return GLOB_ABORTED; ++ ++ return 0; ++ } ++ ++ error = 0; ++ ++ /* Search directory for matching names. */ ++ if (pglob->gl_flags & GLOB_ALTDIRFUNC) ++ readdirfunc = pglob->gl_readdir; ++ else ++ readdirfunc = (struct dirent *(*)(void *)) readdir; ++ while ((dp = (*readdirfunc)(dirp)) != NULL) { ++ unsigned char *sc; ++ Char *dc; ++ ++ if ((pglob->gl_flags & GLOB_LIMIT) && ++ limit->l_readdir++ >= GLOB_LIMIT_READDIR) { ++ errno = 0; ++ *pathend++ = SEP; ++ *pathend = EOS; ++ error = GLOB_NOSPACE; ++ break; ++ } ++ ++ /* ++ * Initial DOT must be matched literally, unless we have ++ * GLOB_PERIOD set. ++ */ ++ if ((pglob->gl_flags & GLOB_PERIOD) == 0) ++ if (dp->d_name[0] == DOT && *pattern != DOT) ++ continue; ++ /* ++ * If GLOB_NO_DOTDIRS is set, . and .. vanish. ++ */ ++ if ((pglob->gl_flags & GLOB_NO_DOTDIRS) && ++ (dp->d_name[0] == DOT) && ++ ((dp->d_name[1] == EOS) || ++ ((dp->d_name[1] == DOT) && (dp->d_name[2] == EOS)))) ++ continue; ++ /* ++ * The resulting string contains EOS, so we can ++ * use the pathlim character, if it is the nul ++ */ ++ for (sc = (unsigned char *) dp->d_name, dc = pathend; ++ dc <= pathlim && (*dc++ = *sc++) != EOS;) ++ continue; ++ ++ /* ++ * Have we filled the buffer without seeing EOS? ++ */ ++ if (dc > pathlim && *pathlim != EOS) { ++ /* ++ * Abort when requested by caller, otherwise ++ * reset pathend back to last SEP and continue ++ * with next dir entry. ++ */ ++ if (pglob->gl_flags & GLOB_ERR) { ++ error = GLOB_ABORTED; ++ break; ++ } ++ else { ++ *pathend = EOS; ++ continue; ++ } ++ } ++ ++ if (globstar) { ++#ifdef S_IFLNK ++ if (!chase_symlinks && ++ (g_lstat(pathbuf, &sbuf, pglob) || ++ S_ISLNK(sbuf.st_mode))) ++ continue; ++#endif ++ ++ if (!match(pathend, pattern, termstar)) ++ continue; ++ ++ if (--dc < pathlim - 2) ++ *dc++ = SEP; ++ *dc = EOS; ++ error = glob2(pathbuf, dc, pathlim, pglobstar, ++ pglob, limit); ++ if (error) ++ break; ++ *pathend = EOS; ++ } else { ++ if (!match(pathend, pattern, restpattern)) { ++ *pathend = EOS; ++ continue; ++ } ++ error = glob2(pathbuf, --dc, pathlim, restpattern, ++ pglob, limit); ++ if (error) ++ break; ++ } ++ } ++ if (pglob->gl_flags & GLOB_ALTDIRFUNC) ++ (*pglob->gl_closedir)(dirp); ++ else ++ closedir(dirp); ++ ++ /* ++ * Again Posix X/Open issue with regards to error handling. ++ */ ++ if ((error || errno) && (pglob->gl_flags & GLOB_ERR)) ++ return GLOB_ABORTED; ++ ++ return error; ++} ++ ++ ++/* ++ * Extend the gl_pathv member of a glob_t structure to accommodate a new item, ++ * add the new item, and update gl_pathc. ++ * ++ * This assumes the BSD realloc, which only copies the block when its size ++ * crosses a power-of-two boundary; for v7 realloc, this would cause quadratic ++ * behavior. ++ * ++ * Return 0 if new item added, error code if memory couldn't be allocated. ++ * ++ * Invariant of the glob_t structure: ++ * Either gl_pathc is zero and gl_pathv is NULL; or gl_pathc > 0 and ++ * gl_pathv points to (gl_offs + gl_pathc + 1) items. ++ */ ++static int ++globextend(const Char *path, glob_t *pglob, struct glob_limit *limit) ++{ ++ char **pathv; ++ size_t i, newsize, len; ++ char *copy; ++ const Char *p; ++ ++ _DIAGASSERT(path != NULL); ++ _DIAGASSERT(pglob != NULL); ++ ++ newsize = sizeof(*pathv) * (2 + pglob->gl_pathc + pglob->gl_offs); ++ if ((pglob->gl_flags & GLOB_LIMIT) && ++ newsize > GLOB_LIMIT_PATH * sizeof(*pathv)) ++ goto nospace; ++ pathv = pglob->gl_pathv ? realloc(pglob->gl_pathv, newsize) : ++ malloc(newsize); ++ if (pathv == NULL) ++ return GLOB_NOSPACE; ++ ++ if (pglob->gl_pathv == NULL && pglob->gl_offs > 0) { ++ /* first time around -- clear initial gl_offs items */ ++ pathv += pglob->gl_offs; ++ for (i = pglob->gl_offs + 1; --i > 0; ) ++ *--pathv = NULL; ++ } ++ pglob->gl_pathv = pathv; ++ ++ for (p = path; *p++;) ++ continue; ++ len = (size_t)(p - path); ++ limit->l_string += len; ++ if ((copy = malloc(len)) != NULL) { ++ if (g_Ctoc(path, copy, len)) { ++ free(copy); ++ return GLOB_ABORTED; ++ } ++ pathv[pglob->gl_offs + pglob->gl_pathc++] = copy; ++ } ++ pathv[pglob->gl_offs + pglob->gl_pathc] = NULL; ++ ++ if ((pglob->gl_flags & GLOB_LIMIT) && ++ (newsize + limit->l_string) >= GLOB_LIMIT_STRING) ++ goto nospace; ++ ++ return copy == NULL ? GLOB_NOSPACE : 0; ++nospace: ++ errno = 0; ++ return GLOB_NOSPACE; ++} ++ ++ ++/* ++ * pattern matching function for filenames. ++ */ ++static int ++match(const Char *name, const Char *pat, const Char *patend) ++{ ++ int ok, negate_range; ++ Char c, k; ++ const Char *patNext, *nameNext, *nameStart, *nameEnd; ++ ++ _DIAGASSERT(name != NULL); ++ _DIAGASSERT(pat != NULL); ++ _DIAGASSERT(patend != NULL); ++ patNext = pat; ++ nameStart = nameNext = name; ++ nameEnd = NULL; ++ ++ while (pat < patend || *name) { ++ c = *pat; ++ if (*name == EOS) ++ nameEnd = name; ++ switch (c & M_MASK) { ++ case M_ALL: ++ while ((pat[1] & M_MASK) == M_ALL) pat++; ++ patNext = pat; ++ nameNext = name + 1; ++ pat++; ++ continue; ++ case M_ONE: ++ if (*name == EOS) ++ break; ++ pat++; ++ name++; ++ continue; ++ case M_SET: ++ ok = 0; ++ if ((k = *name) == EOS) ++ break; ++ pat++; ++ name++; ++ if ((negate_range = ((*pat & M_MASK) == M_NOT)) != EOS) ++ ++pat; ++ while (((c = *pat++) & M_MASK) != M_END) ++ if ((*pat & M_MASK) == M_RNG) { ++ if (c <= k && k <= pat[1]) ++ ok = 1; ++ pat += 2; ++ } else if (c == k) ++ ok = 1; ++ if (ok == negate_range) ++ break; ++ continue; ++ default: ++ if (*name != c) ++ break; ++ pat++; ++ name++; ++ continue; ++ } ++ if (nameNext != nameStart ++ && (nameEnd == NULL || nameNext <= nameEnd)) { ++ pat = patNext; ++ name = nameNext; ++ continue; ++ } ++ return 0; ++ } ++ return 1; ++} ++ ++/* Free allocated data belonging to a glob_t structure. */ ++void ++globfree(glob_t *pglob) ++{ ++ size_t i; ++ char **pp; ++ ++ _DIAGASSERT(pglob != NULL); ++ ++ if (pglob->gl_pathv != NULL) { ++ pp = pglob->gl_pathv + pglob->gl_offs; ++ for (i = pglob->gl_pathc; i--; ++pp) ++ if (*pp) ++ free(*pp); ++ free(pglob->gl_pathv); ++ pglob->gl_pathv = NULL; ++ pglob->gl_pathc = 0; ++ } ++} ++ ++#ifndef __LIBC12_SOURCE__ ++int ++glob_pattern_p(const char *pattern, int quote) ++{ ++ int range = 0; ++ ++ for (; *pattern; pattern++) ++ switch (*pattern) { ++ case QUESTION: ++ case STAR: ++ return 1; ++ ++ case QUOTE: ++ if (quote && pattern[1] != EOS) ++ ++pattern; ++ break; ++ ++ case LBRACKET: ++ range = 1; ++ break; ++ ++ case RBRACKET: ++ if (range) ++ return 1; ++ break; ++ default: ++ break; ++ } ++ ++ return 0; ++} ++#endif ++ ++static DIR * ++g_opendir(Char *str, glob_t *pglob) ++{ ++ char buf[MAXPATHLEN]; ++ ++ _DIAGASSERT(str != NULL); ++ _DIAGASSERT(pglob != NULL); ++ ++ if (!*str) ++ (void)strlcpy(buf, ".", sizeof(buf)); ++ else { ++ if (g_Ctoc(str, buf, sizeof(buf))) ++ return NULL; ++ } ++ ++ if (pglob->gl_flags & GLOB_ALTDIRFUNC) ++ return (*pglob->gl_opendir)(buf); ++ ++ return opendir(buf); ++} ++ ++static int ++g_lstat(Char *fn, __gl_stat_t *sb, glob_t *pglob) ++{ ++ char buf[MAXPATHLEN]; ++ ++ _DIAGASSERT(fn != NULL); ++ _DIAGASSERT(sb != NULL); ++ _DIAGASSERT(pglob != NULL); ++ ++ if (g_Ctoc(fn, buf, sizeof(buf))) ++ return -1; ++ if (pglob->gl_flags & GLOB_ALTDIRFUNC) ++ return (*pglob->gl_lstat)(buf, sb); ++ return lstat(buf, sb); ++} ++ ++static int ++g_stat(Char *fn, __gl_stat_t *sb, glob_t *pglob) ++{ ++ char buf[MAXPATHLEN]; ++ ++ _DIAGASSERT(fn != NULL); ++ _DIAGASSERT(sb != NULL); ++ _DIAGASSERT(pglob != NULL); ++ ++ if (g_Ctoc(fn, buf, sizeof(buf))) ++ return -1; ++ if (pglob->gl_flags & GLOB_ALTDIRFUNC) ++ return (*pglob->gl_stat)(buf, sb); ++ return stat(buf, sb); ++} ++ ++static Char * ++g_strchr(const Char *str, int ch) ++{ ++ ++ _DIAGASSERT(str != NULL); ++ ++ do { ++ if (*str == ch) ++ return __UNCONST(str); ++ } while (*str++); ++ return NULL; ++} ++ ++static int ++g_Ctoc(const Char *str, char *buf, size_t len) ++{ ++ char *dc; ++ ++ _DIAGASSERT(str != NULL); ++ _DIAGASSERT(buf != NULL); ++ ++ if (len == 0) ++ return 1; ++ ++ for (dc = buf; len && (*dc++ = *str++) != EOS; len--) ++ continue; ++ ++ return len == 0; ++} ++ ++#ifdef DEBUG ++static void ++qprintf(const char *str, Char *s) ++{ ++ Char *p; ++ ++ _DIAGASSERT(str != NULL); ++ _DIAGASSERT(s != NULL); ++ ++ (void)printf("%s:\n", str); ++ for (p = s; *p; p++) ++ (void)printf("%c", CHAR(*p)); ++ (void)printf("\n"); ++ for (p = s; *p; p++) ++ (void)printf("%c", *p & M_PROTECT ? '"' : ' '); ++ (void)printf("\n"); ++ for (p = s; *p; p++) ++ (void)printf("%c", ismeta(*p) ? '_' : ' '); ++ (void)printf("\n"); ++} ++#endif diff --git a/Ports/mandoc/patches/add-glob.patch b/Ports/mandoc/patches/add-glob.patch new file mode 100644 index 0000000000..d970049d80 --- /dev/null +++ b/Ports/mandoc/patches/add-glob.patch @@ -0,0 +1,118 @@ +--- mandoc-1.14.5/glob.h.orig Sat Jan 25 20:20:24 2020 ++++ mandoc-1.14.5/glob.h Sat Jan 25 20:20:44 2020 +@@ -0,0 +1,115 @@ ++/* $NetBSD: glob.h,v 1.27 2019/05/29 01:21:33 christos Exp $ */ ++ ++/* ++ * Copyright (c) 1989, 1993 ++ * The Regents of the University of California. All rights reserved. ++ * ++ * This code is derived from software contributed to Berkeley by ++ * Guido van Rossum. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * 3. Neither the name of the University nor the names of its contributors ++ * may be used to endorse or promote products derived from this software ++ * without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE ++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ * SUCH DAMAGE. ++ * ++ * @(#)glob.h 8.1 (Berkeley) 6/2/93 ++ */ ++ ++#ifndef _GLOB_H_ ++#define _GLOB_H_ ++ ++#include <sys/cdefs.h> ++#include <sys/types.h> ++#include <sys/stat.h> ++ ++#ifndef __gl_size_t ++#define __gl_size_t size_t ++#endif ++#ifndef __gl_stat_t ++#define __gl_stat_t struct stat ++#endif ++ ++typedef struct { ++ __gl_size_t gl_pathc; /* Count of total paths so far. */ ++ __gl_size_t gl_matchc; /* Count of paths matching pattern. */ ++ __gl_size_t gl_offs; /* Reserved at beginning of gl_pathv. */ ++ int gl_flags; /* Copy of flags parameter to glob. */ ++ char **gl_pathv; /* List of paths matching pattern. */ ++ /* Copy of errfunc parameter to glob. */ ++ int (*gl_errfunc)(const char *, int); ++ ++ /* ++ * Alternate filesystem access methods for glob; replacement ++ * versions of closedir(3), readdir(3), opendir(3), stat(2) ++ * and lstat(2). ++ */ ++ void (*gl_closedir)(void *); ++ struct dirent *(*gl_readdir)(void *); ++ void *(*gl_opendir)(const char *); ++ int (*gl_lstat)(const char *, __gl_stat_t *); ++ int (*gl_stat)(const char *, __gl_stat_t *); ++} glob_t; ++ ++#define GLOB_APPEND 0x00001 /* Append to output from previous call. */ ++#define GLOB_DOOFFS 0x00002 /* Use gl_offs. */ ++#define GLOB_ERR 0x00004 /* Return on error. */ ++#define GLOB_MARK 0x00008 /* Append / to matching directories. */ ++#define GLOB_NOCHECK 0x00010 /* Return pattern itself if nothing matches. */ ++#define GLOB_NOSORT 0x00020 /* Don't sort. */ ++#define GLOB_NOESCAPE 0x01000 /* Disable backslash escaping. */ ++ ++#define GLOB_NOSPACE (-1) /* Malloc call failed. */ ++#define GLOB_ABORTED (-2) /* Unignored error. */ ++#define GLOB_NOMATCH (-3) /* No match, and GLOB_NOCHECK was not set. */ ++#define GLOB_NOSYS (-4) /* Implementation does not support function. */ ++ ++#define _NETBSD_SOURCE 1 ++ ++#if defined(_NETBSD_SOURCE) || defined(HAVE_NBTOOL_CONFIG_H) ++#define GLOB_ALTDIRFUNC 0x00040 /* Use alternately specified directory funcs. */ ++#define GLOB_BRACE 0x00080 /* Expand braces ala csh. */ ++#define GLOB_MAGCHAR 0x00100 /* Pattern had globbing characters. */ ++#define GLOB_NOMAGIC 0x00200 /* GLOB_NOCHECK without magic chars (csh). */ ++#define GLOB_LIMIT 0x00400 /* Limit memory used by matches to ARG_MAX */ ++#define GLOB_TILDE 0x00800 /* Expand tilde names from the passwd file. */ ++/* GLOB_NOESCAPE 0x01000 above */ ++#define GLOB_PERIOD 0x02000 /* Allow metachars to match leading periods. */ ++#define GLOB_NO_DOTDIRS 0x04000 /* Make . and .. vanish from wildcards. */ ++#define GLOB_STAR 0x08000 /* Use glob ** to recurse directories */ ++#define GLOB_TILDE_CHECK 0x10000 /* Expand tilde names from the passwd file. */ ++#define GLOB_QUOTE 0 /* source compatibility */ ++ ++#define GLOB_ABEND GLOB_ABORTED /* source compatibility */ ++#endif ++ ++__BEGIN_DECLS ++#ifndef __LIBC12_SOURCE__ ++int glob(const char * __restrict, int, ++ int (*)(const char *, int), glob_t * __restrict); ++void globfree(glob_t *); ++#endif ++#ifdef _NETBSD_SOURCE ++int glob_pattern_p(const char *, int); ++#endif ++__END_DECLS ++ ++#endif /* !_GLOB_H_ */ diff --git a/Ports/mandoc/patches/fix-Makefile.patch b/Ports/mandoc/patches/fix-Makefile.patch new file mode 100644 index 0000000000..de8d5c82e0 --- /dev/null +++ b/Ports/mandoc/patches/fix-Makefile.patch @@ -0,0 +1,18 @@ +--- mandoc-1.14.5/Makefile.orig Sat Jan 25 20:14:41 2020 ++++ mandoc-1.14.5/Makefile Sat Jan 25 20:15:10 2020 +@@ -63,6 +63,7 @@ + compat_fts.c \ + compat_getline.c \ + compat_getsubopt.c \ ++ compat_glob.c \ + compat_isblank.c \ + compat_mkdtemp.c \ + compat_ohash.c \ +@@ -251,6 +252,7 @@ + compat_fts.o \ + compat_getline.o \ + compat_getsubopt.o \ ++ compat_glob.o \ + compat_isblank.o \ + compat_mkdtemp.o \ + compat_ohash.o \ diff --git a/Ports/mandoc/patches/fix-catman.patch b/Ports/mandoc/patches/fix-catman.patch new file mode 100644 index 0000000000..607a92ca97 --- /dev/null +++ b/Ports/mandoc/patches/fix-catman.patch @@ -0,0 +1,11 @@ +--- mandoc-1.14.5/catman.c.orig Sun Jan 19 23:55:20 2020 ++++ mandoc-1.14.5/catman.c Sun Jan 19 23:55:30 2020 +@@ -113,7 +113,7 @@ + if ((sz = sendmsg(fd, &msg, 0)) != -1 || + errno != EAGAIN) + break; +- nanosleep(&timeout, NULL); ++ sleep(1); + } + return sz; + } diff --git a/Ports/mandoc/patches/fix-configure.patch b/Ports/mandoc/patches/fix-configure.patch new file mode 100644 index 0000000000..329aaf9ee8 --- /dev/null +++ b/Ports/mandoc/patches/fix-configure.patch @@ -0,0 +1,92 @@ +--- mandoc-1.14.5/configure.orig Sat Jan 25 20:56:19 2020 ++++ mandoc-1.14.5/configure Sat Jan 25 20:56:55 2020 +@@ -35,14 +35,13 @@ + + SOURCEDIR=`dirname "$0"` + +-MANPATH_BASE="/usr/share/man:/usr/X11R6/man" +-MANPATH_DEFAULT="/usr/share/man:/usr/X11R6/man:/usr/local/man" +-OSENUM= +-OSNAME= ++MANPATH_BASE="/usr/share/man:/usr/local/share/man" ++MANPATH_DEFAULT="/usr/share/man:/usr/local/share/man" ++OSENUM=MANDOC_OS_OTHER ++OSNAME=Serenity + UTF8_LOCALE= + +-CC=`printf "all:\\n\\t@echo \\\$(CC)\\n" | env -i make -sf -` +-CFLAGS= ++CFLAGS="-O2 -pipe" + LDADD= + LDFLAGS= + LD_NANOSLEEP= +@@ -62,17 +61,17 @@ + HAVE_ERR= + HAVE_FTS= + HAVE_FTS_COMPARE_CONST= +-HAVE_GETLINE= ++HAVE_GETLINE=1 + HAVE_GETSUBOPT= + HAVE_ISBLANK= + HAVE_LESS_T= +-HAVE_MKDTEMP= ++HAVE_MKDTEMP=1 + HAVE_NANOSLEEP= +-HAVE_NTOHL= ++HAVE_NTOHL=1 + HAVE_O_DIRECTORY= + HAVE_OHASH= + HAVE_PATH_MAX= +-HAVE_PLEDGE= ++HAVE_PLEDGE=0 + HAVE_PROGNAME= + HAVE_REALLOCARRAY= + HAVE_RECALLOCARRAY= +@@ -84,7 +83,7 @@ + HAVE_STRINGLIST= + HAVE_STRLCAT= + HAVE_STRLCPY= +-HAVE_STRNDUP= ++HAVE_STRNDUP=1 + HAVE_STRPTIME= + HAVE_STRSEP= + HAVE_STRTONUM= +@@ -361,20 +360,6 @@ + echo 1>&3 + fi + +-# --- nanosleep --- +-if [ -n "${LD_NANOSLEEP}" ]; then +- runtest nanosleep NANOSLEEP "${LD_NANOSLEEP}" || true +-elif singletest nanosleep NANOSLEEP; then +- : +-elif runtest nanosleep NANOSLEEP "-lrt"; then +- LD_NANOSLEEP="-lrt" +-fi +-if [ "${HAVE_NANOSLEEP}" -eq 0 ]; then +- echo "FATAL: nanosleep: no" 1>&2 +- echo "FATAL: nanosleep: no" 1>&3 +- exit 1 +-fi +- + if [ ${BUILD_CATMAN} -gt 0 ]; then + # --- recvmsg --- + if [ -n "${LD_RECVMSG}" ]; then +@@ -420,7 +405,7 @@ + fi + + # --- LDADD --- +-LDADD="${LDADD} ${LD_NANOSLEEP} ${LD_RECVMSG} ${LD_OHASH} -lz" ++LDADD="${LDADD} ${LD_NANOSLEEP} ${LD_RECVMSG} ${LD_OHASH} -lpcre2-posix -lpcre2-8 -lz" + echo "selected LDADD=\"${LDADD}\"" 1>&2 + echo "selected LDADD=\"${LDADD}\"" 1>&3 + echo 1>&3 +@@ -572,7 +557,7 @@ + [ -z "${BIN_FROM_SBIN}" ] && BIN_FROM_SBIN="../bin" + [ -z "${INCLUDEDIR}" ] && INCLUDEDIR="${PREFIX}/include/mandoc" + [ -z "${LIBDIR}" ] && LIBDIR="${PREFIX}/lib/mandoc" +-[ -z "${MANDIR}" ] && MANDIR="${PREFIX}/man" ++[ -z "${MANDIR}" ] && MANDIR="${PREFIX}/share/man" + + [ -z "${HTDOCDIR}" ] && HTDOCDIR="${WWWPREFIX}/htdocs" + [ -z "${CGIBINDIR}" ] && CGIBINDIR="${WWWPREFIX}/cgi-bin" diff --git a/Ports/mandoc/patches/fix-dba-read.patch b/Ports/mandoc/patches/fix-dba-read.patch new file mode 100644 index 0000000000..fa28b28546 --- /dev/null +++ b/Ports/mandoc/patches/fix-dba-read.patch @@ -0,0 +1,11 @@ +--- mandoc-1.14.5/dba_read.c.orig Sat Jan 25 20:11:14 2020 ++++ mandoc-1.14.5/dba_read.c Sat Jan 25 20:11:22 2020 +@@ -19,7 +19,7 @@ + * The interface is defined in "dba.h". + * This file is seperate from dba.c because this also uses "dbm.h". + */ +-#include <regex.h> ++#include <pcre2posix.h> + #include <stdint.h> + #include <stdlib.h> + #include <stdio.h> diff --git a/Ports/mandoc/patches/fix-dbm-map.patch b/Ports/mandoc/patches/fix-dbm-map.patch new file mode 100644 index 0000000000..612fc8b581 --- /dev/null +++ b/Ports/mandoc/patches/fix-dbm-map.patch @@ -0,0 +1,11 @@ +--- mandoc-1.14.5/dbm_map.c.orig Sat Jan 25 20:09:42 2020 ++++ mandoc-1.14.5/dbm_map.c Sat Jan 25 20:09:49 2020 +@@ -36,7 +36,7 @@ + #endif + #include <errno.h> + #include <fcntl.h> +-#include <regex.h> ++#include <pcre2posix.h> + #include <stdint.h> + #include <stdlib.h> + #include <string.h> diff --git a/Ports/mandoc/patches/fix-dbm.patch b/Ports/mandoc/patches/fix-dbm.patch new file mode 100644 index 0000000000..7bfe662767 --- /dev/null +++ b/Ports/mandoc/patches/fix-dbm.patch @@ -0,0 +1,11 @@ +--- mandoc-1.14.5/dbm.c.orig Sat Jan 25 20:09:04 2020 ++++ mandoc-1.14.5/dbm.c Sat Jan 25 20:09:16 2020 +@@ -31,7 +31,7 @@ + #include <err.h> + #endif + #include <errno.h> +-#include <regex.h> ++#include <pcre2posix.h> + #include <stdint.h> + #include <stdio.h> + #include <stdlib.h> diff --git a/Ports/mandoc/patches/fix-demandoc.patch b/Ports/mandoc/patches/fix-demandoc.patch new file mode 100644 index 0000000000..8dddf61ab2 --- /dev/null +++ b/Ports/mandoc/patches/fix-demandoc.patch @@ -0,0 +1,10 @@ +--- mandoc-1.14.5/demandoc.c.orig Mon Jan 20 00:18:29 2020 ++++ mandoc-1.14.5/demandoc.c Mon Jan 20 00:18:39 2020 +@@ -30,6 +30,7 @@ + #include "man.h" + #include "mdoc.h" + #include "mandoc_parse.h" ++#include "getopt.h" + + static void pline(int, int *, int *, int); + static void pman(const struct roff_node *, int *, int *, int); diff --git a/Ports/mandoc/patches/fix-main.patch b/Ports/mandoc/patches/fix-main.patch new file mode 100644 index 0000000000..1efadae9a9 --- /dev/null +++ b/Ports/mandoc/patches/fix-main.patch @@ -0,0 +1,43 @@ +--- mandoc-1.14.5/main.c.orig Sat Jan 25 20:29:18 2020 ++++ mandoc-1.14.5/main.c Sat Jan 25 20:30:06 2020 +@@ -30,7 +30,6 @@ + #endif + #include <errno.h> + #include <fcntl.h> +-#include <glob.h> + #if HAVE_SANDBOX_INIT + #include <sandbox.h> + #endif +@@ -42,6 +41,7 @@ + #include <termios.h> + #include <time.h> + #include <unistd.h> ++#include <getopt.h> + + #include "mandoc_aux.h" + #include "mandoc.h" +@@ -54,6 +54,7 @@ + #include "main.h" + #include "manconf.h" + #include "mansearch.h" ++#include "glob.h" + + enum outmode { + OUTMODE_DEF = 0, +@@ -660,6 +661,7 @@ + if (!WIFSTOPPED(status)) + break; + ++#define WSTOPSIG(x) 0 + signum = WSTOPSIG(status); + } + tag_unlink(); +@@ -1239,7 +1241,7 @@ + /* Do not start the pager before controlling the terminal. */ + + while (tcgetpgrp(STDOUT_FILENO) != getpid()) +- nanosleep(&timeout, NULL); ++ sleep(1); + + execvp(argv[0], argv); + err((int)MANDOCLEVEL_SYSERR, "exec %s", argv[0]); diff --git a/Ports/mandoc/patches/fix-mandocdb.patch b/Ports/mandoc/patches/fix-mandocdb.patch new file mode 100644 index 0000000000..18a81e9f3a --- /dev/null +++ b/Ports/mandoc/patches/fix-mandocdb.patch @@ -0,0 +1,10 @@ +--- mandoc-1.14.5/mandocdb.c.orig Sat Jan 25 20:18:09 2020 ++++ mandoc-1.14.5/mandocdb.c Sat Jan 25 20:18:22 2020 +@@ -45,6 +45,7 @@ + #include <stdlib.h> + #include <string.h> + #include <unistd.h> ++#include <getopt.h> + + #include "mandoc_aux.h" + #include "mandoc_ohash.h" diff --git a/Ports/mandoc/patches/fix-mansearch.patch b/Ports/mandoc/patches/fix-mansearch.patch new file mode 100644 index 0000000000..8798178978 --- /dev/null +++ b/Ports/mandoc/patches/fix-mansearch.patch @@ -0,0 +1,14 @@ +--- mandoc-1.14.5/mansearch.c.orig Sat Jan 25 20:17:03 2020 ++++ mandoc-1.14.5/mansearch.c Sat Jan 25 20:17:11 2020 +@@ -26,9 +26,9 @@ + #endif + #include <errno.h> + #include <fcntl.h> +-#include <glob.h> ++#include "glob.h" + #include <limits.h> +-#include <regex.h> ++#include <pcre2posix.h> + #include <stdio.h> + #include <stdint.h> + #include <stddef.h> diff --git a/Ports/mandoc/patches/fix-soelim.patch b/Ports/mandoc/patches/fix-soelim.patch new file mode 100644 index 0000000000..b5a0127ddf --- /dev/null +++ b/Ports/mandoc/patches/fix-soelim.patch @@ -0,0 +1,10 @@ +--- mandoc-1.14.5/soelim.c.orig Mon Jan 20 00:18:44 2020 ++++ mandoc-1.14.5/soelim.c Mon Jan 20 00:18:55 2020 +@@ -42,6 +42,7 @@ + #include "compat_stringlist.h" + #endif + #include <unistd.h> ++#include "getopt.h" + + #define C_OPTION 0x1 + |