Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DE72684D68 for ; Sat, 7 Oct 2023 19:50:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id IylX1MhdVibj for ; Sat, 7 Oct 2023 19:50:25 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0A09484D55 for ; Sat, 7 Oct 2023 19:50:25 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 024CDFADB; Sat, 7 Oct 2023 19:50:25 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1696708224129710" MIME-Version: 1.0 Date: Sat, 7 Oct 2023 19:50:24 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/textproc/discount To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20231007195025.024CDFADB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1696708224129710 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Sat Oct 7 19:50:24 UTC 2023 Modified Files: pkgsrc/textproc/discount: Makefile distinfo pkgsrc/textproc/discount/patches: patch-generate.c Log Message: discount: update to 2.2.7d. From the changelog: * port the m-e footnote bugfix to v2maint * trivialities; change the -fstrict option description * add a fistful of test cases for the new! improved! Markdown.pl compatible * rework the tag handler to more closely adhere to Markdown.pl's observed behavior; also treat incomplete tags as actual tags in compatability mode (-fstrict) * weird behavior on freebsd 4.8 w/ gcc 2.95.4; if a #ifdef ... #else ... #endif wraps the end of a if () it pukes up an error about a syntax error in a macro; pull those tests out and conditionally #define a macro instead * the behavior of tags-starting-with-alpha-/-! was not like that of the reference implementation; fixed (in a very script-kiddy leaky fashion which I can't resolve with a runtime flag thanks to the 32 bit flags field in the 2.x series :-( To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 pkgsrc/textproc/discount/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/textproc/discount/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/discount/patches/patch-generate.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1696708224129710 Content-Disposition: inline Content-Length: 3601 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/discount/Makefile diff -u pkgsrc/textproc/discount/Makefile:1.14 pkgsrc/textproc/discount/Makefile:1.15 --- pkgsrc/textproc/discount/Makefile:1.14 Tue Nov 15 11:37:56 2022 +++ pkgsrc/textproc/discount/Makefile Sat Oct 7 19:50:24 2023 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.14 2022/11/15 11:37:56 schmonz Exp $ +# $NetBSD: Makefile,v 1.15 2023/10/07 19:50:24 schmonz Exp $ -DISTNAME= discount-2.2.7b +DISTNAME= discount-2.2.7d CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GITHUB:=Orc/} GITHUB_TAG= v${PKGVERSION_NOREV} Index: pkgsrc/textproc/discount/distinfo diff -u pkgsrc/textproc/discount/distinfo:1.15 pkgsrc/textproc/discount/distinfo:1.16 --- pkgsrc/textproc/discount/distinfo:1.15 Tue Nov 15 11:37:56 2022 +++ pkgsrc/textproc/discount/distinfo Sat Oct 7 19:50:24 2023 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.15 2022/11/15 11:37:56 schmonz Exp $ +$NetBSD: distinfo,v 1.16 2023/10/07 19:50:24 schmonz Exp $ -BLAKE2s (discount-2.2.7b.tar.gz) = 0b15bade0498744be856b981893f9b71d09177edfd1973b05deddc58343b04df -SHA512 (discount-2.2.7b.tar.gz) = 80b7435da385ba91c8cf3112db2f1f8dcc64ec3455c19d25a0303fbb5ddbd3ff0afade509a48b2e538296f4b7b8645dac4c2c5e30c70ebc433ee49842bf31e16 -Size (discount-2.2.7b.tar.gz) = 129219 bytes +BLAKE2s (discount-2.2.7d.tar.gz) = 57f5465f1b921b1561377c6e4e862ad210f2a100b6527f8909c21f665c434569 +SHA512 (discount-2.2.7d.tar.gz) = d7e652a2687bc31605a9fcb4d95133627778d13e84c0a663ebb848d6b356f4892cc14648540627280590c8d422a9d91b6503bf223be1e7f98c9900d084dfc3b5 +Size (discount-2.2.7d.tar.gz) = 133382 bytes SHA1 (patch-Makefile.in) = 7919a26def7f5aceb7fa0570824fd183ac0bb856 -SHA1 (patch-generate.c) = ca870b8ecf485bd14e9b3302c90fc4a97d73c2f7 +SHA1 (patch-generate.c) = 41a6d7e1dea9c52b24df5853ed0db5b17030b51e Index: pkgsrc/textproc/discount/patches/patch-generate.c diff -u pkgsrc/textproc/discount/patches/patch-generate.c:1.3 pkgsrc/textproc/discount/patches/patch-generate.c:1.4 --- pkgsrc/textproc/discount/patches/patch-generate.c:1.3 Mon Jun 10 13:32:56 2019 +++ pkgsrc/textproc/discount/patches/patch-generate.c Sat Oct 7 19:50:24 2023 @@ -1,19 +1,19 @@ -$NetBSD: patch-generate.c,v 1.3 2019/06/10 13:32:56 schmonz Exp $ +$NetBSD: patch-generate.c,v 1.4 2023/10/07 19:50:24 schmonz Exp $ Fix self-tests on NetBSD. ---- generate.c.orig 2019-04-15 15:28:20.000000000 +0000 +--- generate.c.orig 2023-08-23 08:09:27.000000000 +0000 +++ generate.c -@@ -757,7 +757,7 @@ linkylinky(int image, MMIOT *f) - else { - int goodlink, implicit_mark = mmiottell(f); - -- if ( isspace(peek(f,1)) ) -+ if ( isspace((unsigned char)peek(f,1)) ) - pull(f); - - if ( peek(f,1) == '[' ) { -@@ -1161,7 +1161,7 @@ islike(MMIOT *f, char *s) +@@ -766,7 +766,7 @@ linkylinky(int image, MMIOT *f) + goodlink = 1; + } + else { +- if ( isspace(peek(f,1)) ) ++ if ( isspace((unsigned char)peek(f,1)) ) + pull(f); + + if ( peek(f,1) == '[' ) { +@@ -1216,7 +1216,7 @@ islike(MMIOT *f, char *s) } for (i=1; i < len; i++) @@ -22,7 +22,7 @@ Fix self-tests on NetBSD. return 0; return 1; } -@@ -1281,7 +1281,7 @@ tickhandler(MMIOT *f, int tickchar, int +@@ -1336,7 +1336,7 @@ tickhandler(MMIOT *f, int tickchar, int int endticks, size; int tick = nrticks(0, tickchar, f); @@ -31,7 +31,7 @@ Fix self-tests on NetBSD. return 0; if ( (tick >= minticks) && (size = matchticks(f,tickchar,tick,&endticks)) ) { -@@ -1309,7 +1309,7 @@ text(MMIOT *f) +@@ -1364,7 +1364,7 @@ text(MMIOT *f) int smartyflags = 0; while (1) { --_----------=_1696708224129710--