From nobody Thu Apr 27 22:58:38 2023 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q6rkl0TdPz4853Q; Thu, 27 Apr 2023 22:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q6rkk5728z3KHR; Thu, 27 Apr 2023 22:58:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682636318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=taaqdyMe4XI6Z4hSNfwMQ9M0VU0Abwh/bvbA179zf4M=; b=PCq0oSizAfiwpW0+TqdIjaf0/h8QiGRN3UOxwJEpix+gO+I5xQrwGWBDaORSxX0ZCxNYZ0 0kyO+nzevq2ajQlleH/ouyUeiYcaid7OAfGlEOV+W03GOTpj+pA3irwTK9GM06/eZjVb2V ufsoDVqwDd3WZJX1Gn4MiICgfSBgJ951z0x+RlzpK/XUKx0fTujQMASWwWOu0XmQqe2YUp RO7wI9oQkTplGy2R8rIOu0ZgA7nMCX0CirGvvRGzwQbWcdaA8GzxUS+JSky9Jn2C+2kubv KK1q7oFbaBAc9E1XDlwGPE0vMhLYJNbGEMXNR9YRtVqcqYEOtIWHuL4MRZKo9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682636318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=taaqdyMe4XI6Z4hSNfwMQ9M0VU0Abwh/bvbA179zf4M=; b=aETj2VwvAl038Ceg7Oo5uMmCO39Eq+JMS4ApLG9hjFRy4UUXaH3pKZQrrDR+J33cezZQf0 tOTD8l+/hFFI2Hr/3Q9y6sZh2pcuhTTxsb3TbwyRfY+61YjMqXsPK9+LWQSs6pHfsGq2r9 rpQwEAB30Nf2WxQlsMbIqVQ9k27MMI1JKUNuhEVppx+nxV4Ne+t8F8qEzXme+S5u6r7/0g rakbYjgr5/g2eW6I6H8o+5h8YCZP13SsmJIolsmPuvTExjvu++k/DUCGK4teIgKog/qYkK GqAQfIsENKupWkiifgl+RWwFW+wrH1O3HRNWBCo/Ys+a07kaPylvlttFnS3Neg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682636318; a=rsa-sha256; cv=none; b=jNW14B16lCAAjegYZkwAhot9CLiaGLp3+U7UfnF3yF/gK4ihsR4leIBnhybxsf26l9yBvu 6Hpug3eeufTXDMnWpfW/EAaXsqJmKQSer3IbeqcAKI5179r1pQ5LCku/7CjyqCn/CY4Ivp BCqxCzgfSCXdzcgdQa78zv/fkedgjs39Fb7wZyIrVfMxB68I2TJmew4aJf191tbO574p/T a/1nWimexFXz+R7SveAGeZKJsuiOXaf54m850yv0hTvptlCVVV+N+mYM6D2qw7fOdcUJqw 1elsUdMtQPF1dkokHDA7BuFeMnDM+jz1WKrp86fqPq85M/DiDM5ErjUNB8GnAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q6rkk4CKfzbwg; Thu, 27 Apr 2023 22:58:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33RMwcp1025385; Thu, 27 Apr 2023 22:58:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33RMwcDo025384; Thu, 27 Apr 2023 22:58:38 GMT (envelope-from git) Date: Thu, 27 Apr 2023 22:58:38 GMT Message-Id: <202304272258.33RMwcDo025384@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dima Panov Subject: git: 11a2be5f1911 - 2023Q2 - textproc/libxml2: update to 2.10.14 security release (+) List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 11a2be5f1911d9e357a87eb302d84d3adf16a783 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=11a2be5f1911d9e357a87eb302d84d3adf16a783 commit 11a2be5f1911d9e357a87eb302d84d3adf16a783 Author: Dima Panov AuthorDate: 2023-04-27 18:07:36 +0000 Commit: Dima Panov CommitDate: 2023-04-27 22:58:04 +0000 textproc/libxml2: update to 2.10.14 security release (+) - [CVE-2023-29469] Hashing of empty dict strings isn't deterministic - [CVE-2023-28484] Fix null deref in xmlSchemaFixupComplexType - schemas: Fix null-pointer-deref in xmlSchemaCheckCOSSTDerivedOK - SAX2: Ignore namespaces in HTML documents - io: Fix "buffer full" error with certain buffer sizes PR: 270906 Security: 0bd7f07b-dc22-11ed-bf28-589cfc0f81b0 Sponsored by: Serenity Cybersecurity, LLC (cherry picked from commit acd6567eeccaba062051ae4571c3d20c355383ac) --- textproc/libxml2/Makefile | 23 +++++++++++------------ textproc/libxml2/distinfo | 6 +++--- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index d160d12a6b58..831f09d9079f 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -1,6 +1,6 @@ PORTNAME= libxml2 -DISTVERSION= 2.10.3 -PORTREVISION?= 1 +DISTVERSION= 2.10.4 +PORTREVISION?= 0 CATEGORIES?= textproc gnome MASTER_SITES= GNOME/sources/${PORTNAME}/${DISTVERSION:R}/ DIST_SUBDIR= gnome @@ -23,19 +23,18 @@ LICENSE= MIT # thoroughly may be reverted. USES+= cpe iconv libtool localbase pathfix pkgconfig tar:xz CPE_VENDOR= xmlsoft -GNU_CONFIGURE= yes USE_LDCONFIG= yes +GNU_CONFIGURE= yes +# Don't build with Python support unless requested +CONFIGURE_ARGS= --sysconfdir=${PREFIX}/share/ \ + --with-lzma=/usr \ + --${LIBXML2_SLAVE:Dwith:Uwithout}-python${LIBXML2_SLAVE:D=${PYTHON_CMD}:U} INSTALL_TARGET= install-strip TEST_TARGET= check PLIST_SUB+= LIBVERSION=${DISTVERSION} -# Don't build with Python support unless requested -CONFIGURE_ARGS= --sysconfdir=${PREFIX}/share/ \ - --with-lzma=/usr \ - --${LIBXML2_SLAVE:Dwith:Uwithout}-python${LIBXML2_SLAVE:D=${PYTHON_CMD}:U} - OPTIONS_DEFINE= DOCS ICU MEM_DEBUG READLINE STATIC THREAD_ALLOC OPTIONS_DEFAULT= READLINE STATIC OPTIONS_SUB= yes @@ -54,21 +53,21 @@ STATIC_CONFIGURE_ENABLE= static THREAD_ALLOC_CONFIGURE_WITH= thread-alloc post-patch: -.for f in catalog.c xmlcatalog.c xmllint.c doc/xmllint.1 @${REINPLACE_CMD} -e \ 's|/etc/xml/catalog|${LOCALBASE}/share/xml/catalog|g; \ s|/etc/sgml/catalog|${LOCALBASE}/share/sgml/catalog|g' \ - ${WRKSRC}/${f} -.endfor + ${WRKSRC}/doc/xmllint.1 -.if !defined(LIBXML2_SLAVE) post-install: +.if !defined(LIBXML2_SLAVE) # Documentation should be in DOCSDIR @${MV} ${STAGEDIR}${PREFIX}/share/gtk-doc/html/libxml2 \ ${STAGEDIR}${DOCSDIR}/devhelp @${RM} -r ${STAGEDIR}${PREFIX}/share/gtk-doc # Install remaining documentation that's not connected to autotools ${INSTALL_MAN} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR} +.else + ${STRIP_CMD} ${STAGEDIR}${PYTHON_LIBDIR}/site-packages/libxml2mod${PYTHON_EXT_SUFFIX}.so .endif .include diff --git a/textproc/libxml2/distinfo b/textproc/libxml2/distinfo index ad8ca4ad9118..58f47a87615f 100644 --- a/textproc/libxml2/distinfo +++ b/textproc/libxml2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1665950945 -SHA256 (gnome/libxml2-2.10.3.tar.xz) = 5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c -SIZE (gnome/libxml2-2.10.3.tar.xz) = 2639908 +TIMESTAMP = 1681763197 +SHA256 (gnome/libxml2-2.10.4.tar.xz) = ed0c91c5845008f1936739e4eee2035531c1c94742c6541f44ee66d885948d45 +SIZE (gnome/libxml2-2.10.4.tar.xz) = 2643600