Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 24 Apr 2019 06:25:54 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r499816 - in head/textproc/docbook2mdoc: . files
Message-ID:  <201904240625.x3O6Ps61020647@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Wed Apr 24 06:25:54 2019
New Revision: 499816
URL: https://svnweb.freebsd.org/changeset/ports/499816

Log:
  Incorporate an upstream patch preventing a crash when parsing
  some docbook files

Added:
  head/textproc/docbook2mdoc/files/
  head/textproc/docbook2mdoc/files/patch-parse.c   (contents, props changed)
Modified:
  head/textproc/docbook2mdoc/Makefile

Modified: head/textproc/docbook2mdoc/Makefile
==============================================================================
--- head/textproc/docbook2mdoc/Makefile	Wed Apr 24 06:14:43 2019	(r499815)
+++ head/textproc/docbook2mdoc/Makefile	Wed Apr 24 06:25:54 2019	(r499816)
@@ -2,6 +2,7 @@
 
 PORTNAME=	docbook2mdoc
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://mdocml.bsd.lv/docbook2mdoc/snapshots/
 

Added: head/textproc/docbook2mdoc/files/patch-parse.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/docbook2mdoc/files/patch-parse.c	Wed Apr 24 06:25:54 2019	(r499816)
@@ -0,0 +1,20 @@
+--- parse.c.orig	2019-04-17 18:31:23 UTC
++++ parse.c
+@@ -553,7 +553,7 @@ xml_attrkey(struct parse *p, const char *name)
+ 	const char	*value;
+ 	enum attrkey	 key;
+ 
+-	if (p->del > 0 || p->ncur == NODE_IGNORE || *name == '\0')
++	if (p->del > 0 || p->ncur == NODE_UNKNOWN || *name == '\0')
+ 		return;
+ 
+ 	if ((p->ncur == NODE_DOCTYPE || p->ncur == NODE_ENTITY) &&
+@@ -590,7 +590,7 @@ xml_attrval(struct parse *p, const char *name)
+ {
+ 	struct pattr	*a;
+ 
+-	if (p->del > 0 || p->ncur == NODE_IGNORE ||
++	if (p->del > 0 || p->ncur == NODE_UNKNOWN ||
+ 	    (p->flags & PFLAG_ATTR) == 0)
+ 		return;
+ 	if ((a = TAILQ_LAST(&p->cur->attrq, pattrq)) == NULL)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904240625.x3O6Ps61020647>