diff options
| author | wiz <wiz> | 2011-01-13 10:14:16 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2011-01-13 10:14:16 +0000 |
| commit | ecbabf74ddf26a756363cafc4ff0df846683e8f5 (patch) | |
| tree | dc06c655587adf98e5f94f54d8f874332d5fbf5c | |
| parent | 063d60711ce71ead7f08c09f9b55fb0eacfc1753 (diff) | |
| download | pkgsrc-ecbabf74ddf26a756363cafc4ff0df846683e8f5.tar.gz | |
Add post-release patch from upstream that joerg deems critical.
Ride update.
| -rw-r--r-- | textproc/mdocml/distinfo | 3 | ||||
| -rw-r--r-- | textproc/mdocml/patches/patch-aa | 29 |
2 files changed, 31 insertions, 1 deletions
diff --git a/textproc/mdocml/distinfo b/textproc/mdocml/distinfo index 52700aa6955..73a5bb9abfa 100644 --- a/textproc/mdocml/distinfo +++ b/textproc/mdocml/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.19 2011/01/13 09:39:41 wiz Exp $ +$NetBSD: distinfo,v 1.20 2011/01/13 10:14:16 wiz Exp $ SHA1 (mdocml-1.10.9.tar.gz) = a8e0342912ac782a9baf0c173ca2338fafecdb1d RMD160 (mdocml-1.10.9.tar.gz) = 932882dace9475f72fd45e532f8fd8bb4702a9c7 Size (mdocml-1.10.9.tar.gz) = 185048 bytes +SHA1 (patch-aa) = c71cdc89b3dbef6f992aca4f8386b7f1a992a3f4 diff --git a/textproc/mdocml/patches/patch-aa b/textproc/mdocml/patches/patch-aa new file mode 100644 index 00000000000..2afd88bc110 --- /dev/null +++ b/textproc/mdocml/patches/patch-aa @@ -0,0 +1,29 @@ +$NetBSD: patch-aa,v 1.1 2011/01/13 10:14:16 wiz Exp $ + +Post-release patch from upstream fixing a core dump in pcap-save*. + +--- tbl_data.c.orig 2011-01-07 15:07:54.000000000 +0000 ++++ tbl_data.c +@@ -167,13 +167,19 @@ tbl_data(struct tbl_node *tbl, int ln, c + /* + * Choose a layout row: take the one following the last parsed + * span's. If that doesn't exist, use the last parsed span's. +- * If there's no last parsed span, use the first row. This can +- * be NULL! ++ * If there's no last parsed span, use the first row. Lastly, ++ * if the last span was a horizontal line, use the same layout ++ * (it doesn't "consume" the layout). ++ * ++ * In the end, this can be NULL! + */ + + if (tbl->last_span) { + assert(tbl->last_span->layout); +- rp = tbl->last_span->layout->next; ++ if (tbl->last_span->pos == TBL_SPAN_DATA) ++ rp = tbl->last_span->layout->next; ++ else ++ rp = tbl->last_span->layout; + if (NULL == rp) + rp = tbl->last_span->layout; + } else |