textproc/groff 1.24.1

Hello ports@ Attached is an update for groff 1.22.4 -> 1.24.1. A jump of 8 years! Ingo Schwarze is the maintainer of this port and previously did work to update to 1.23.0 [1], much of this diff was made cross referencing upstream, -current, and his patch. [1] https://marc.info/?l=openbsd-ports&m=160529500629494 In his 1.23.0, Ingo undid a lot of the OpenBSD-specific fat-trimming in CONFIGURE_ARGS. I'm not as confident in my own ability to make sure that's done properly so I've left that as-is in case there is interest in it perhaps in a later revision. Regression test results: - Without patches, groff's regression tests fail the following check: FAIL: font/devpdf/tests/check-urw-foundry.sh - With patches, testing this port fails the following checks: FAIL: contrib/mm/tests/letter-with-bottom-block-works.sh FAIL: contrib/mm/tests/letters-format-correctly.sh FAIL: contrib/mm/tests/memoranda-format-correctly.sh FAIL: font/devpdf/tests/check-urw-foundry.sh FAIL: src/preproc/eqn/tests/neqn-smoke-test.sh FAIL: src/roff/groff/tests/adjustment-works.sh FAIL: src/roff/groff/tests/backslash-X-is-transparent-to-hyphenation.sh FAIL: src/roff/groff/tests/br-and-brp-requests-work.sh FAIL: src/roff/groff/tests/hcode-request-copies-spec-char-code.sh FAIL: src/roff/groff/tests/hla-request-works.sh FAIL: src/roff/groff/tests/warn-on-underset-adjusted-line.sh FAIL: tmac/tests/an_HY-register-works.sh FAIL: tmac/tests/an_MT-body-hyphenates.sh FAIL: tmac/tests/an_TH-repairs-ad-damage.sh FAIL: tmac/tests/an_TH-repairs-hy-damage.sh FAIL: tmac/tests/an_UE-breaks-before-long-URIs.sh FAIL: tmac/tests/an_UR-body-hyphenates.sh FAIL: tmac/tests/an_adjust-link-text-correctly.sh FAIL: tmac/tests/an_adjustment-mode-preserved-after-paragraph-tag.sh FAIL: tmac/tests/an_adjustment-mode-restoration-works.sh FAIL: tmac/tests/an_hyphenation-mode-restoration-works.sh FAIL: tmac/tests/an_paragraph-reset-restores-hyphenation-mode.sh FAIL: tmac/tests/andoc_clear-doc-traps.sh FAIL: tmac/tests/doc_Nm-works.sh FAIL: tmac/tests/doc_adjustment-mode-restoration-works.sh FAIL: tmac/tests/doc_indents-correctly.sh FAIL: tmac/tests/s_vertical-margins-are-correct.sh As far as I can tell, these additional failures are a benign result of the stylistic changes made in patches that have carried over from 1.22.4. Patch changes: * patch-Makefile_in Fixed upstream * patch-contrib_pdfmark_pdfroff_sh pdfroff removed since 1.24.0 * patch-lib_vasnprintf_c Fixed upstream * patch-tmac_an-old_tmac -> patch-tmac_an_tmac * patch-tmac_doc-common-u -> patch-tmac_mdoc_doc-common. * patch-tmac_doc_tmac-u Fixed upstream Looking for review and testing. OK? Andrew diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile index c7608a927..2c2d62e58 100644 --- a/textproc/groff/Makefile +++ b/textproc/groff/Makefile @@ -1,8 +1,7 @@ COMMENT = GNU troff typesetter -VERSION = 1.22.4 +VERSION = 1.24.1 SUBST_VARS = VERSION DISTNAME = groff-${VERSION} -REVISION = 4 CATEGORIES = textproc DPB_PROPERTIES = parallel diff --git a/textproc/groff/distinfo b/textproc/groff/distinfo index 2f2ac156c..f8aebf357 100644 --- a/textproc/groff/distinfo +++ b/textproc/groff/distinfo @@ -1,2 +1,2 @@ -SHA256 (groff-1.22.4.tar.gz) = 5457TLfewxCEkAT6iIR8RHAejRM7XUwTBX2HbButApM= -SIZE (groff-1.22.4.tar.gz) = 4137480 +SHA256 (groff-1.24.1.tar.gz) = dOKBl5W2r/QxrqyYPWOpyJaO6roqLrp9+LpMe0Hnz9g= +SIZE (groff-1.24.1.tar.gz) = 9005760 diff --git a/textproc/groff/patches/patch-Makefile_in b/textproc/groff/patches/patch-Makefile_in deleted file mode 100644 index c5d2e3528..000000000 --- a/textproc/groff/patches/patch-Makefile_in +++ /dev/null @@ -1,14 +0,0 @@ -To process the hdtbl example files, eqn(1) is used, so build it first. - -Index: Makefile.in ---- Makefile.in.orig -+++ Makefile.in -@@ -11545,7 +11545,7 @@ $(hdtblexample_DATA): $(HDTBLSTRIPFILES) - && sed -e "s|[@]fontdir[@]|$(fontdir)|" \ - -e "s|[@]EGREP[@]|$(EGREP)|" $< >$@ - --$(HDTBLPROCESSEDEXAMPLEFILES): gnu.eps groff troff pic tbl \ -+$(HDTBLPROCESSEDEXAMPLEFILES): gnu.eps groff troff eqn pic tbl \ - contrib/hdtbl/examples/common.roff - - $(HDTBLSTRIPFILES): $(top_srcdir)/tmac/strip.sed diff --git a/textproc/groff/patches/patch-contrib_pdfmark_pdfroff_sh b/textproc/groff/patches/patch-contrib_pdfmark_pdfroff_sh deleted file mode 100644 index 1af12f7c9..000000000 --- a/textproc/groff/patches/patch-contrib_pdfmark_pdfroff_sh +++ /dev/null @@ -1,22 +0,0 @@ -# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=538330 -# references a large patch by Solar Designer. -# Some of those things are fixed in 1.21, most do not look exploitable. -# This is the only one that seems worth patching away: ---- contrib/pdfmark/pdfroff.sh.orig Fri Dec 31 08:33:09 2010 -+++ contrib/pdfmark/pdfroff.sh Wed Jun 22 01:37:47 2011 -@@ -153,11 +153,10 @@ - else - # - # Creation of a private temporary directory was unsuccessful; -- # fall back to user nominated directory, (using current directory -- # as default), and schedule removal of only the temporary files. -- # -- GROFF_TMPDIR=${TMPDIR} -- trap "rm -f ${GROFF_TMPDIR}/pdf$$.*" 0 -+ # DO NOT fall back to user nominated directory, -+ # because that would allow symlink attacks. -+ echo >&2 "$CMD: mktemp(1) -d failure" -+ exit 1 - fi - # - # In the case of abnormal termination events, we force an exit diff --git a/textproc/groff/patches/patch-lib_vasnprintf_c b/textproc/groff/patches/patch-lib_vasnprintf_c deleted file mode 100644 index fb502cf8c..000000000 --- a/textproc/groff/patches/patch-lib_vasnprintf_c +++ /dev/null @@ -1,17 +0,0 @@ -Don't use printf %n. - -Index: lib/vasnprintf.c ---- lib/vasnprintf.c.orig -+++ lib/vasnprintf.c -@@ -4871,10 +4871,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, -