Received: by mail.netbsd.org (Postfix, from userid 605) id 1213984E7A; Fri, 31 Mar 2023 00:43:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3E8F584E19 for ; Fri, 31 Mar 2023 00:43:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id gh5C3eTp3zul for ; Fri, 31 Mar 2023 00:43:22 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 4134484D10 for ; Fri, 31 Mar 2023 00:43:22 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 2AE95FA81; Fri, 31 Mar 2023 00:43:22 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_168022340230300" MIME-Version: 1.0 Date: Fri, 31 Mar 2023 00:43:22 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/textproc/lua-expat To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20230331004322.2AE95FA81@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_168022340230300 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="UTF-8" Module Name: pkgsrc Committed By: joerg Date: Fri Mar 31 00:43:22 UTC 2023 Modified Files: pkgsrc/textproc/lua-expat: Makefile PLIST distinfo pkgsrc/textproc/lua-expat/patches: patch-Makefile Log Message: Update to lua-expat-1.5.1: Added option "allowDTD" to the threat protection parser. Add configuration for Billion Laughs Attack prevention. Expose Expat compile time constants (lxp._EXPAT_FEATURES), see Expat documentation. Fix bad buffer size calculation in threat parser Improved Lua version support (5.1 - 5.4) Fix memory leak when callbacks reference a parser object Expose Expat library version (lxp._EXPAT_VERSION) Added 'lxp.totable' module (thanks Tomás Guisasola Gorham) Fix integers being returned as floats on Lua 5.3+ (thanks Kim Alvefur) Fix XmlDecl callback can also return 'nil' for 'standalone' Many documentation updates Added triplet namespace setting (returnnstriplet) Added EntityDecl handler Added AttlistDecl handler Added ElementDecl handler Added SkippedEntity handler Added EndDoctypeDecl handler More tests and new test setup; Busted, LuaCheck, Github actions Improved finishing, multiple nil-calls no longer throw errors Fix 'lxp.lom' to properly handle input as function, table, or file Added option for namespace aware parsing to the 'lxp.lom' module Repository moved to lunarmodules Added threat protection parser (protects against excessively large inputs), with options for the 'lxp.lom' and 'lxp.totable' to use it. support for the XmlDecl handler add parser:getcurrentbytecount() (XML_GetCurrentByteCount) ability to disable CharacterData merging To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 pkgsrc/textproc/lua-expat/Makefile cvs rdiff -u -r1.4 -r1.5 pkgsrc/textproc/lua-expat/PLIST cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/lua-expat/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/lua-expat/patches/patch-Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_168022340230300 Content-Disposition: inline Content-Length: 4070 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/textproc/lua-expat/Makefile diff -u pkgsrc/textproc/lua-expat/Makefile:1.24 pkgsrc/textproc/lua-expat/Makefile:1.25 --- pkgsrc/textproc/lua-expat/Makefile:1.24 Thu Jul 2 10:26:19 2020 +++ pkgsrc/textproc/lua-expat/Makefile Fri Mar 31 00:43:21 2023 @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.24 2020/07/02 10:26:19 nia Exp $ +# $NetBSD: Makefile,v 1.25 2023/03/31 00:43:21 joerg Exp $ # -DISTNAME= luaexpat-1.3.0 +DISTNAME= luaexpat-1.5.1 PKGNAME= ${DISTNAME:S/lua/${LUA_PKGPREFIX}-/} -PKGREVISION= 2 CATEGORIES= textproc lua -MASTER_SITES= https://matthewwild.co.uk/projects/luaexpat/ +MASTER_SITES= ${MASTER_SITE_GITHUB:=lunarmodules/} +GITHUB_PROJECT= luaexpat MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://matthewwild.co.uk/projects/luaexpat/ Index: pkgsrc/textproc/lua-expat/PLIST diff -u pkgsrc/textproc/lua-expat/PLIST:1.4 pkgsrc/textproc/lua-expat/PLIST:1.5 --- pkgsrc/textproc/lua-expat/PLIST:1.4 Wed Oct 30 06:04:16 2013 +++ pkgsrc/textproc/lua-expat/PLIST Fri Mar 31 00:43:21 2023 @@ -1,3 +1,5 @@ -@comment $NetBSD: PLIST,v 1.4 2013/10/30 06:04:16 dholland Exp $ +@comment $NetBSD: PLIST,v 1.5 2023/03/31 00:43:21 joerg Exp $ ${LUA_CDIR}/lxp.so ${LUA_LDIR}/lxp/lom.lua +${LUA_LDIR}/lxp/threat.lua +${LUA_LDIR}/lxp/totable.lua Index: pkgsrc/textproc/lua-expat/distinfo diff -u pkgsrc/textproc/lua-expat/distinfo:1.10 pkgsrc/textproc/lua-expat/distinfo:1.11 --- pkgsrc/textproc/lua-expat/distinfo:1.10 Tue Oct 26 11:22:19 2021 +++ pkgsrc/textproc/lua-expat/distinfo Fri Mar 31 00:43:21 2023 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.10 2021/10/26 11:22:19 nia Exp $ +$NetBSD: distinfo,v 1.11 2023/03/31 00:43:21 joerg Exp $ -BLAKE2s (luaexpat-1.3.0.tar.gz) = dd880c80cdd53ff42f6c148c10135084dc02cdb05567844c209a09bf4f2f1636 -SHA512 (luaexpat-1.3.0.tar.gz) = 91884653310e2dc89ade6d1653875ac8607640a21853d3ccb1fd0f833812e41981fad5c40101732ec249104d2c50c9a332208d1e44423b8428065a223c60b4ae -Size (luaexpat-1.3.0.tar.gz) = 29567 bytes -SHA1 (patch-Makefile) = 5110d3a8201bec9b857d4d9270431df922927da4 +BLAKE2s (luaexpat-1.5.1.tar.gz) = d2bb8d158896605dec7c794883b06f8411598296da06b18517384d36daaa355c +SHA512 (luaexpat-1.5.1.tar.gz) = 45834b02d863a65c6de2ad3c5c671935ae512dd906233a647269438aeeb37c7bbd6e7166aefd8da72480b33e1aa79a86ed070ed8800a8e0f303ccc74918f3bb8 +Size (luaexpat-1.5.1.tar.gz) = 53912 bytes +SHA1 (patch-Makefile) = 563f7a64fca9b08c4178e46e82faa58853985598 Index: pkgsrc/textproc/lua-expat/patches/patch-Makefile diff -u pkgsrc/textproc/lua-expat/patches/patch-Makefile:1.2 pkgsrc/textproc/lua-expat/patches/patch-Makefile:1.3 --- pkgsrc/textproc/lua-expat/patches/patch-Makefile:1.2 Mon Apr 7 19:39:17 2014 +++ pkgsrc/textproc/lua-expat/patches/patch-Makefile Fri Mar 31 00:43:21 2023 @@ -1,17 +1,21 @@ -$NetBSD: patch-Makefile,v 1.2 2014/04/07 19:39:17 fhajny Exp $ +$NetBSD: patch-Makefile,v 1.3 2023/03/31 00:43:21 joerg Exp $ * Remove -D option of install, BSD install does not support it. ---- Makefile.orig 2014-04-02 23:30:37.000000000 +0000 +--- Makefile.orig 2022-10-03 09:23:43.000000000 +0000 +++ Makefile -@@ -27,8 +27,8 @@ src/$(LIBNAME): - $(CC) $(CF) -o $@ src/$(T)lib.c $(LF) +@@ -27,10 +27,10 @@ src/$(LIBNAME): + $(CC) $(CF) $(RPM_OPT_FLAGS) $(RPM_LD_FLAGS) -o $@ src/$(T)lib.c $(LF) install: - $(INSTALL_PROGRAM) -D src/$(LIBNAME) $(DESTDIR)$(LUA_CDIR)/$(LIBNAME) -- $(INSTALL_PROGRAM) -D src/$T/lom.lua $(DESTDIR)$(LUA_LDIR)/$T/lom.lua +- $(INSTALL_DATA) -D src/$T/lom.lua $(DESTDIR)$(LUA_LDIR)/$T/lom.lua +- $(INSTALL_DATA) -D src/$T/totable.lua $(DESTDIR)$(LUA_LDIR)/$T/totable.lua +- $(INSTALL_DATA) -D src/$T/threat.lua $(DESTDIR)$(LUA_LDIR)/$T/threat.lua + $(INSTALL_PROGRAM) src/$(LIBNAME) $(DESTDIR)$(LUA_CDIR)/$(LIBNAME) -+ $(INSTALL_PROGRAM) src/$T/lom.lua $(DESTDIR)$(LUA_LDIR)/$T/lom.lua ++ $(INSTALL_DATA) src/$T/lom.lua $(DESTDIR)$(LUA_LDIR)/$T/lom.lua ++ $(INSTALL_DATA) src/$T/totable.lua $(DESTDIR)$(LUA_LDIR)/$T/totable.lua ++ $(INSTALL_DATA) src/$T/threat.lua $(DESTDIR)$(LUA_LDIR)/$T/threat.lua clean: $(RM) src/$(LIBNAME) $(OBJS) --_----------=_168022340230300--