From nobody Thu Dec 1 14:14:42 2022 X-Original-To: dev-commits-ports-main@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 4NNJ431xBBz4jK7X; Thu, 1 Dec 2022 14:14:43 +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 4NNJ431NNYz3qfD; Thu, 1 Dec 2022 14:14:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669904083; 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=KunngCkNgt2C4ViuY5sA289wI2xU3PAweZNU68tc6vM=; b=jmL9F92tacO7q0MAzHtPLnfsqFhe/1WAcuMsBTuo7IKa0wo8/TsMxGugSNsoP6iFrAIJp4 p2O0xOZIClWNZU+8LiVh4M1/KNzM6oH45/JXdUzB3ap8vzGJ/vLvMrBtUHAXPrgiBo7wvY Zt4v/KdlowcHOCIW4S6LMCV2q76Xv4mdPqCl8iLp3CD30fUQa6uHkTMde6QiBwKRFc9+33 piT2WnkwRkAP9Z8EojesUqarIuH1INl+8H+ME35VzR9+knMOia1kjRJj7spbgf6sDa2gtv Wjmmeqh5hlBA4wZC/6KhSvIODATO9Gx/oHEQsEjL0yyoa/icVT2YP2w1QbeaHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669904083; 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=KunngCkNgt2C4ViuY5sA289wI2xU3PAweZNU68tc6vM=; b=Cmh41cwsEJDZ+AgrkFk8hLlpjzuR+ikt2s7RAhzEw102f3JQqw6yuoRsU/TV5mNGLj+BHl jnGgsiGU+hX9Kc/oIOVAw5ilVpWLhOcoEnDvDM8OsxW0rmxRnXbFzjEELsk2uxQyno3ku7 NoMFJQxx6aZWsHEJ+5IYbHXzqq7f8Oaz6a6Ecr2MbIru7oGvRKuqapboSSbwbiXl8AP4I2 KUtUQ8x2oOJfEaGrxBy2xIa2H7tySg9bT9r5D8lcvYHLqhYCPzp6BGiGsdvx9YIBKJ34FA LgRho2SRV0td8UYh8x84bo2NtWECvtW0vAyTaNvP6yedKUQzBW4F/CMMT0y3yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669904083; a=rsa-sha256; cv=none; b=ELdN0tUNHl66KANVVGlakv+kjJ/brdeUpNyTNEEm0Ln+SZxWMKGDHK0cFpXZ8H2Ww4hIka aE4MJk2/5lvyZCAfeQh+iO9xXppfNXSWpYM33UiTe452jW6yTfBnGW/2uL0n/NfnStuba5 Eeva3fKVYR/k+yiw3j0YYll99B5Ki/IBzV3u9zJTEWUhbvx1zhAF4ZbbaM+epaXpxnWzbI r9Pw+DtmbNr4xHzum8jKE4/1b/rSA7enIaIbRhq32FIyvCxk4m04cs2ICIL+WVy6XQireh 6VLzi6wJKzh7zj1Ga9al3CkCg7NgcYtD9GvpRMNhmB1cg1hGK4AqMLvxJ0zT7Q== 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 4NNJ430CVtzftH; Thu, 1 Dec 2022 14:14:43 +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 2B1EEgRg064931; Thu, 1 Dec 2022 14:14:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B1EEgnC064930; Thu, 1 Dec 2022 14:14:42 GMT (envelope-from git) Date: Thu, 1 Dec 2022 14:14:42 GMT Message-Id: <202212011414.2B1EEgnC064930@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rodrigo Osorio Subject: git: 22f3de494a13 - main - archivers/rpm4: update to version 4.18.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rodrigo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22f3de494a13dd291e45c2e11b19adc37d70bb15 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=22f3de494a13dd291e45c2e11b19adc37d70bb15 commit 22f3de494a13dd291e45c2e11b19adc37d70bb15 Author: Rodrigo Osorio AuthorDate: 2022-11-23 16:09:28 +0000 Commit: Rodrigo Osorio CommitDate: 2022-12-01 14:03:36 +0000 archivers/rpm4: update to version 4.18.0 Major changes: * Add a new Sequoia-based OpenPGP backend * Documentation updates * Fix intermediate symlinks not verified (CVE-2021-35939) * Fix subkey binding signatures not checked on PGP public keys (CVE-2021-3521) * Refactor file and directory operations to use fd-based APIs throughout (CVE-2021-35938) * Unbreak lua 2 for extensions Full release note: https://rpm.org/wiki/Releases/4.18.0.html Also remove version requirement for Lua dependency in port, we just use lua. PR: 267291 Reported by: Brian Zou Security: CVE-2021-35939 Security: CVE-2021-3521 Security: CVE-2021-35938 --- archivers/rpm4/Makefile | 12 ++++++------ archivers/rpm4/distinfo | 6 +++--- archivers/rpm4/files/patch-luaext_lrexlib.c | 11 ----------- archivers/rpm4/files/patch-misc_fts.c | 16 ++++++++-------- archivers/rpm4/files/patch-tools_rpmuncompress.c | 9 +++++++++ archivers/rpm4/pkg-plist | 18 +++++++++++++----- audio/spotifyd/files/extra-patch.Cargo.toml | 11 +++++++++++ 7 files changed, 50 insertions(+), 33 deletions(-) diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile index 442db528d1a4..716ac758cda1 100644 --- a/archivers/rpm4/Makefile +++ b/archivers/rpm4/Makefile @@ -1,8 +1,7 @@ PORTNAME= rpm -PORTVERSION= 4.17.0 -PORTREVISION= 2 +PORTVERSION= 4.18.0 CATEGORIES= archivers -MASTER_SITES= http://ftp.rpm.org/releases/rpm-4.17.x/ +MASTER_SITES= http://ftp.rpm.org/releases/rpm-${PORTVERSION:R}.x/ PKGNAMESUFFIX= 4 MAINTAINER= rodrigo@FreeBSD.org @@ -21,15 +20,16 @@ RUN_DEPENDS= bash:shells/bash \ gxargs:misc/findutils USES= alias bdb sqlite cpe gmake iconv libarchive libtool \ - lua:53+ pathfix pkgconfig shebangfix tar:bzip2 + lua pathfix pkgconfig shebangfix tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes BINARY_ALIAS= sed=${LOCALBASE}/bin/gsed SHEBANG_FILES= scripts/check-prereqs \ scripts/check-rpaths-worker scripts/pkgconfigdeps.sh \ - scripts/fontconfig.prov scripts/perl.prov scripts/perl.req \ - scripts/find-lang.sh scripts/ocamldeps.sh + scripts/fontconfig.prov scripts/perl.prov scripts/perl.req \ + scripts/find-lang.sh scripts/ocamldeps.sh \ + scripts/rpm_macros_provides.sh CONFIGURE_ARGS= --enable-sqlite=yes\ --with-popt-prefix="${LOCALBASE}" \ --sysconfdir=${PREFIX}/etc \ diff --git a/archivers/rpm4/distinfo b/archivers/rpm4/distinfo index 7182e2187e9c..98a332709ad3 100644 --- a/archivers/rpm4/distinfo +++ b/archivers/rpm4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635434706 -SHA256 (rpm-4.17.0.tar.bz2) = 2e0d220b24749b17810ed181ac1ed005a56bbb6bc8ac429c21f314068dc65e6a -SIZE (rpm-4.17.0.tar.bz2) = 4514138 +TIMESTAMP = 1663679594 +SHA256 (rpm-4.18.0.tar.bz2) = 2a17152d7187ab30edf2c2fb586463bdf6388de7b5837480955659e5e9054554 +SIZE (rpm-4.18.0.tar.bz2) = 6600013 diff --git a/archivers/rpm4/files/patch-luaext_lrexlib.c b/archivers/rpm4/files/patch-luaext_lrexlib.c deleted file mode 100644 index be27e49a4747..000000000000 --- a/archivers/rpm4/files/patch-luaext_lrexlib.c +++ /dev/null @@ -1,11 +0,0 @@ ---- luaext/lrexlib.c.orig 2020-10-25 13:43:26 UTC -+++ luaext/lrexlib.c -@@ -32,7 +32,7 @@ static int rex_comp(lua_State *L) - regex_t *pr = (regex_t *)lua_newuserdata(L, sizeof(regex_t)); - pattern = luaL_checklstring(L, 1, &l); - #ifdef REG_BASIC -- pr->re_endp = pattern + lua_strlen(L, 1); -+ pr->re_endp = pattern + lua_rawlen(L, (1)); - res = regcomp(pr, pattern, REG_EXTENDED | REG_PEND); - #else - res = regcomp(pr, pattern, REG_EXTENDED); diff --git a/archivers/rpm4/files/patch-misc_fts.c b/archivers/rpm4/files/patch-misc_fts.c index 158aaadb7bdd..4db71d2d3f5a 100644 --- a/archivers/rpm4/files/patch-misc_fts.c +++ b/archivers/rpm4/files/patch-misc_fts.c @@ -1,11 +1,11 @@ ---- misc/fts.c.orig 2020-10-25 13:22:41 UTC +--- misc/fts.c.orig 2022-04-07 11:13:19 UTC +++ misc/fts.c -@@ -32,12 +32,14 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/ - #endif /* LIBC_SCCS and not lint */ +@@ -37,12 +37,14 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/ + #endif /* Conditional to set up proper fstat64 implementation */ --#if defined(hpux) || defined(sun) -+#if defined(hpux) || defined(sun) || defined(__FreeBSD__) +-#if defined(hpux) || defined(sun) || (defined(__APPLE__) && defined(_DARWIN_FEATURE_ONLY_64_BIT_INODE)) ++#if defined(hpux) || defined(sun) || defined(__FreeBSD__) || (defined(__APPLE__) && defined(_DARWIN_FEATURE_ONLY_64_BIT_INODE)) # define FTS_FSTAT64(_fd, _sbp) fstat((_fd), (_sbp)) #else # define FTS_FSTAT64(_fd, _sbp) fstat64((_fd), (_sbp)) @@ -16,7 +16,7 @@ #if defined(_LIBC) #include #include -@@ -51,7 +53,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/ +@@ -56,7 +58,7 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/ #else /* Conditionals for working around non-GNU environments */ @@ -25,8 +25,8 @@ # define _INCLUDE_POSIX_SOURCE # define __errno_location() (&errno) # define dirfd(dirp) -1 -@@ -65,13 +67,11 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/ - # define __errno_location() (__error()) +@@ -73,13 +75,11 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/ + #endif #endif -#include "system.h" diff --git a/archivers/rpm4/files/patch-tools_rpmuncompress.c b/archivers/rpm4/files/patch-tools_rpmuncompress.c new file mode 100644 index 000000000000..0e8f99d25dfa --- /dev/null +++ b/archivers/rpm4/files/patch-tools_rpmuncompress.c @@ -0,0 +1,9 @@ +--- tools/rpmuncompress.c.orig 2022-08-30 11:42:23 UTC ++++ tools/rpmuncompress.c +@@ -1,5 +1,6 @@ + #include "system.h" + ++#include + #include + #include + #include diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist index 4222cee5a1cd..44b26c0610da 100644 --- a/archivers/rpm4/pkg-plist +++ b/archivers/rpm4/pkg-plist @@ -6,6 +6,7 @@ bin/rpmbuild bin/rpmdb bin/rpmgraph bin/rpmkeys +bin/rpmlua bin/rpmquery bin/rpmsign bin/rpmspec @@ -18,6 +19,7 @@ include/rpm/rpmbase64.h include/rpm/rpmbuild.h include/rpm/rpmcallback.h include/rpm/rpmcli.h +include/rpm/rpmcrypto.h include/rpm/rpmdb.h include/rpm/rpmds.h include/rpm/rpmfc.h @@ -49,16 +51,16 @@ include/rpm/rpmutil.h include/rpm/rpmver.h lib/librpm.so lib/librpm.so.9 -lib/librpm.so.9.2.0 +lib/librpm.so.9.3.0 lib/librpmbuild.so lib/librpmbuild.so.9 -lib/librpmbuild.so.9.2.0 +lib/librpmbuild.so.9.3.0 lib/librpmio.so lib/librpmio.so.9 -lib/librpmio.so.9.2.0 +lib/librpmio.so.9.3.0 lib/librpmsign.so lib/librpmsign.so.9 -lib/librpmsign.so.9.2.0 +lib/librpmsign.so.9.3.0 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpm.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/transaction.py @@ -66,8 +68,8 @@ lib/librpmsign.so.9.2.0 %%PLUGINS%%lib/rpm-plugins/prioreset.so %%PLUGINS%%lib/rpm-plugins/syslog.so %%PLUGINS%%lib/rpm-plugins/systemd_inhibit.so -lib/rpm/brp-elfperms lib/rpm/brp-compress +lib/rpm/brp-elfperms lib/rpm/brp-remove-la-files lib/rpm/brp-strip lib/rpm/brp-strip-comment-note @@ -86,6 +88,7 @@ lib/rpm/fileattrs/ocaml.attr lib/rpm/fileattrs/perl.attr lib/rpm/fileattrs/perllib.attr lib/rpm/fileattrs/pkgconfig.attr +lib/rpm/fileattrs/rpm_macro.attr lib/rpm/fileattrs/script.attr lib/rpm/find-lang.sh lib/rpm/find-provides @@ -126,6 +129,7 @@ lib/rpm/platform/i586-%%OPSYS%%/macros lib/rpm/platform/i686-%%OPSYS%%/macros lib/rpm/platform/ia32e-%%OPSYS%%/macros lib/rpm/platform/ia64-%%OPSYS%%/macros +lib/rpm/platform/loongarch64-%%OPSYS%%/macros lib/rpm/platform/m68k-%%OPSYS%%/macros lib/rpm/platform/mips-%%OPSYS%%/macros lib/rpm/platform/mips64-%%OPSYS%%/macros @@ -167,11 +171,13 @@ lib/rpm/rpm.daily lib/rpm/rpm.log lib/rpm/rpm.supp lib/rpm/rpm2cpio.sh +lib/rpm/rpm_macros_provides.sh lib/rpm/rpmdb_dump lib/rpm/rpmdb_load lib/rpm/rpmdeps lib/rpm/rpmpopt-%%VERSION%% lib/rpm/rpmrc +lib/rpm/rpmuncompress lib/rpm/script.req lib/rpm/tgpg libdata/pkgconfig/rpm.pc @@ -197,6 +203,7 @@ man/man8/rpmdb.8.gz man/man8/rpmdeps.8.gz man/man8/rpmgraph.8.gz man/man8/rpmkeys.8.gz +man/man8/rpmlua.8.gz man/man8/rpmsign.8.gz man/man8/rpmspec.8.gz man/pl/man1/gendiff.1.gz @@ -226,6 +233,7 @@ man/sk/man8/rpm.8.gz %%NLS%%share/locale/is/LC_MESSAGES/rpm.mo %%NLS%%share/locale/it/LC_MESSAGES/rpm.mo %%NLS%%share/locale/ja/LC_MESSAGES/rpm.mo +%%NLS%%share/locale/ka/LC_MESSAGES/rpm.mo %%NLS%%share/locale/ko/LC_MESSAGES/rpm.mo %%NLS%%share/locale/ms/LC_MESSAGES/rpm.mo %%NLS%%share/locale/nb/LC_MESSAGES/rpm.mo diff --git a/audio/spotifyd/files/extra-patch.Cargo.toml b/audio/spotifyd/files/extra-patch.Cargo.toml new file mode 100644 index 000000000000..044fd6b99e7c --- /dev/null +++ b/audio/spotifyd/files/extra-patch.Cargo.toml @@ -0,0 +1,11 @@ +--- Cargo.toml.orig 2021-12-07 15:10:37.000000000 -0500 ++++ Cargo.toml 2022-09-29 22:29:56.615602000 -0400 +@@ -37,7 +37,7 @@ + librespot-audio = { version = "0.2.0", default-features=false, features = ["with-tremor"] } + librespot-playback = { version = "0.2.0", default-features=false } + librespot-core = { version = "0.2.0"} +-librespot-connect = { version = "0.2.0"} ++librespot-connect = { version = "0.2.0", features = ["with-dns-sd"]} + toml = "0.5.8" + color-eyre = "0.5" +