From nobody Wed Feb 23 07:58:07 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 0C74D19DDA93; Wed, 23 Feb 2022 07:58:08 +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 4K3T1C6LyRz4TmC; Wed, 23 Feb 2022 07:58:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645603088; 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=kBSE4gP2hAgPuGQ/YaCnwhbDrhy+fjjqapEbrXvZX8M=; b=dGIMQGJ7qfcLpnNweCoRHD0FdzjE3hsBpNcBoF306ey2U6Oy+TPwgAbVyR3lC7X/NzhoTi wihQx8IxnUizyik+kmAgFvzQsfCf9nNQGxKG7e4NT0OfjzV1DU51ussop4sSh4ZjsP4kW+ 1XcqNoNMd+xA0QieDjmEzrpzzGjRwB4KQEQGuMD2CIS5q1amGphNSvmQV8YHyuU3078S2e UfG/sH8l8X+aZ89nK4Nj/K4tML7dr5pjUP2jZ5ATt04IbvDI8qLBEuKneS9us0B63pUF1C MuW7ml/+3cNMshqvlC9nlQX2NStJELGiN41d1fYEL6k2k4Rkajz8GiapfNUyfA== 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 B2FAF1493E; Wed, 23 Feb 2022 07:58:07 +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 21N7w7Ps097123; Wed, 23 Feb 2022 07:58:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21N7w7k9097122; Wed, 23 Feb 2022 07:58:07 GMT (envelope-from git) Date: Wed, 23 Feb 2022 07:58:07 GMT Message-Id: <202202230758.21N7w7k9097122@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: 468b96cf50e2 - main - archivers/rpm4: Update to 4.17.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: 468b96cf50e2b1ee6d555a0e6582e8a1d7f41eef Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645603088; 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=kBSE4gP2hAgPuGQ/YaCnwhbDrhy+fjjqapEbrXvZX8M=; b=YLAZMZx+sjmfkxTL+Ia//Bus3y8Hy0ELxzH7T5YTcC8qBuek+4MFV75NKn3T0kYXyQ/VGJ CXVGctI8e5g47ljOd5cBsLfhYBo0LbYuTER8RW0ZNiMefpSySfBLEO4dlN2Varj7lzAzQu DaBmT6l/8tdLNma5M3+v3W8C+EjDNNDO/Lym1fs0VVQorhL8gg0RgUaL128lWl18Hy2koi 5otsOQg3ySFLZdSlcMmStFH5HBCNhg1EnJ3ci1s/32JZ/0UTaGdySklEdr7Te3hZ2ykO6y vjVKQu19VAvzAh4A0il23ODuKEKLmU69X7VUSzfKWs+lLVXczl+EYVqaxvCArg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645603088; a=rsa-sha256; cv=none; b=Udu+210j37DJUGUBJxmziUYG1YNObnGNas2HJInIBcjfjJBDZYRMdN7tPKap0fCCXnaBjI p2oDVMegQ64N6bGzXBk9enj59LxsjjLvRWotCjqrUwG/NmdWsBPHzXUcBE96/vwK4AgkKC 7svVXfvGqgLAEfV0M5F16PtynZxS7G0u1Zuqq52Y1RUNGA66pHrPxiPg4sIUIT5K0Q4p53 U8uCCACIOuEcgp1d7oE/xFHk/V3Z+efYqrtbLz4G1fN10hZYVEt5RTq05qbG1xYlyPZHS1 Y2wWeGUYO1M76RlNP5zjJ9rl6tAdffjJcj7ptM9OB5D7WMA357KSFrqj+TwrQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=468b96cf50e2b1ee6d555a0e6582e8a1d7f41eef commit 468b96cf50e2b1ee6d555a0e6582e8a1d7f41eef Author: Rodrigo Osorio AuthorDate: 2021-10-29 15:06:16 +0000 Commit: Rodrigo Osorio CommitDate: 2022-02-23 07:48:32 +0000 archivers/rpm4: Update to 4.17.0 Python helpers and scripts used for python packaging was removed from RPM, comunity-driven files should be used instead. Release note: https://rpm.org/wiki/Releases/4.17.0 --- archivers/rpm4/Makefile | 25 +++++++++---------------- archivers/rpm4/distinfo | 6 +++--- archivers/rpm4/pkg-plist | 26 ++++++++++---------------- 3 files changed, 22 insertions(+), 35 deletions(-) diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile index 3a4204c240bb..e2f4f48220dd 100644 --- a/archivers/rpm4/Makefile +++ b/archivers/rpm4/Makefile @@ -1,10 +1,9 @@ # Created by: Greg Lewis PORTNAME= rpm -PORTVERSION= 4.16.1.3 -PORTREVISION= 1 +PORTVERSION= 4.17.0 CATEGORIES= archivers -MASTER_SITES= http://ftp.rpm.org/releases/rpm-4.16.x/ +MASTER_SITES= http://ftp.rpm.org/releases/rpm-4.17.x/ PKGNAMESUFFIX= 4 MAINTAINER= rodrigo@FreeBSD.org @@ -22,16 +21,15 @@ RUN_DEPENDS= bash:shells/bash \ gxargs:misc/findutils USES= alias bdb sqlite cpe gmake iconv libarchive libtool \ - lua:52+ pathfix pkgconfig shebangfix tar:bzip2 + lua:53+ pathfix pkgconfig shebangfix tar:bzip2 USE_LDCONFIG= yes GNU_CONFIGURE= yes BINARY_ALIAS= sed=${LOCALBASE}/bin/gsed -SHEBANG_FILES= scripts/brp-python-bytecompile scripts/check-prereqs \ +SHEBANG_FILES= scripts/check-prereqs \ scripts/check-rpaths-worker scripts/pkgconfigdeps.sh \ scripts/fontconfig.prov scripts/perl.prov scripts/perl.req \ - scripts/pythondistdeps.py scripts/find-lang.sh scripts/ocamldeps.sh \ - scripts/find-debuginfo.sh + scripts/find-lang.sh scripts/ocamldeps.sh CONFIGURE_ARGS= --enable-sqlite=yes\ --with-popt-prefix="${LOCALBASE}" \ --sysconfdir=${PREFIX}/etc \ @@ -60,13 +58,12 @@ OPTIONS_DEFINE= PYTHON PLUGINS NLS DOCS OPTIONS_DEFAULT=PYTHON OPTIONS_SUB= yes -PYTHON_CONFIGURE_ENABLE=python -PYTHON_USES= python - NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext NLS_LIBS= -lintl +PYTHON_RUN_DEPENDS= ${LOCALBASE}/lib/rpm/pythondistdeps.py:archivers/py-python-rpm-packaging + PLUGINS_CONFIGURE_ENABLE=plugins PLUGINS_LIB_DEPENDS= libdbus-1.so:devel/dbus @@ -74,18 +71,14 @@ post-patch: @${REINPLACE_CMD} -e 's:\.\./\.\./bin/::' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's/ __GLIBC__.*/& || defined(__FreeBSD__)/' \ ${WRKSRC}/system.h - @${REINPLACE_CMD} -e 's/\/gxargs/g' ${WRKSRC}/scripts/brp-python-bytecompile \ + @${REINPLACE_CMD} -e 's/\/gxargs/g' \ ${WRKSRC}/scripts/brp-strip-static-archive \ ${WRKSRC}/scripts/check-buildroot \ ${WRKSRC}/scripts/check-rpaths \ - ${WRKSRC}/scripts/find-debuginfo.sh \ ${WRKSRC}/scripts/vpkg-provides.sh -post-install-PYTHON-off: - @${RM} ${STAGEDIR}${PREFIX}/lib/rpm/pythondistdeps.py - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/doc && ${COPYTREE_SHARE} librpm/html ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/docs && ${COPYTREE_SHARE} librpm/html ${STAGEDIR}${DOCSDIR} .include diff --git a/archivers/rpm4/distinfo b/archivers/rpm4/distinfo index 116a89b63844..7182e2187e9c 100644 --- a/archivers/rpm4/distinfo +++ b/archivers/rpm4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619221631 -SHA256 (rpm-4.16.1.3.tar.bz2) = 513dc7f972b6e7ccfc9fc7f9c01d5310cc56ee853892e4314fa2cad71478e21d -SIZE (rpm-4.16.1.3.tar.bz2) = 4354652 +TIMESTAMP = 1635434706 +SHA256 (rpm-4.17.0.tar.bz2) = 2e0d220b24749b17810ed181ac1ed005a56bbb6bc8ac429c21f314068dc65e6a +SIZE (rpm-4.17.0.tar.bz2) = 4514138 diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist index 67761b39552f..46ffa8e077c5 100644 --- a/archivers/rpm4/pkg-plist +++ b/archivers/rpm4/pkg-plist @@ -48,26 +48,21 @@ include/rpm/rpmutil.h include/rpm/rpmver.h lib/librpm.so lib/librpm.so.9 -lib/librpm.so.9.1.3 +lib/librpm.so.9.2.0 lib/librpmbuild.so lib/librpmbuild.so.9 -lib/librpmbuild.so.9.1.3 +lib/librpmbuild.so.9.2.0 lib/librpmio.so lib/librpmio.so.9 -lib/librpmio.so.9.1.3 +lib/librpmio.so.9.2.0 lib/librpmsign.so lib/librpmsign.so.9 -lib/librpmsign.so.9.1.3 -%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/__init__.py -%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpm.so -%%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/transaction.py +lib/librpmsign.so.9.2.0 +lib/rpm/brp-elfperms lib/rpm/brp-compress -lib/rpm/brp-java-gcjcompile -lib/rpm/brp-python-bytecompile -lib/rpm/brp-python-hardlink +lib/rpm/brp-remove-la-files lib/rpm/brp-strip lib/rpm/brp-strip-comment-note -lib/rpm/brp-strip-shared lib/rpm/brp-strip-static-archive lib/rpm/check-buildroot lib/rpm/check-files @@ -78,20 +73,16 @@ lib/rpm/fileattrs/debuginfo.attr lib/rpm/fileattrs/desktop.attr lib/rpm/fileattrs/elf.attr lib/rpm/fileattrs/font.attr -lib/rpm/fileattrs/libtool.attr lib/rpm/fileattrs/metainfo.attr lib/rpm/fileattrs/ocaml.attr lib/rpm/fileattrs/perl.attr lib/rpm/fileattrs/perllib.attr lib/rpm/fileattrs/pkgconfig.attr -lib/rpm/fileattrs/python.attr -lib/rpm/fileattrs/pythondist.attr lib/rpm/fileattrs/script.attr lib/rpm/find-lang.sh lib/rpm/find-provides lib/rpm/find-requires lib/rpm/fontconfig.prov -lib/rpm/libtooldeps.sh lib/rpm/macros lib/rpm/mkinstalldirs lib/rpm/ocamldeps.sh @@ -164,7 +155,6 @@ lib/rpm/platform/sparcv8-%%OPSYS%%/macros lib/rpm/platform/sparcv9-%%OPSYS%%/macros lib/rpm/platform/sparcv9v-%%OPSYS%%/macros lib/rpm/platform/x86_64-%%OPSYS%%/macros -%%PYTHON%%lib/rpm/pythondistdeps.py lib/rpm/rpm.daily lib/rpm/rpm.log lib/rpm/rpm.supp @@ -217,6 +207,8 @@ man/sk/man8/rpm.8.gz %%NLS%%share/locale/es/LC_MESSAGES/rpm.mo %%NLS%%share/locale/fi/LC_MESSAGES/rpm.mo %%NLS%%share/locale/fr/LC_MESSAGES/rpm.mo +%%NLS%%share/locale/gu/LC_MESSAGES/rpm.mo +%%NLS%%share/locale/he/LC_MESSAGES/rpm.mo %%NLS%%share/locale/id/LC_MESSAGES/rpm.mo %%NLS%%share/locale/is/LC_MESSAGES/rpm.mo %%NLS%%share/locale/it/LC_MESSAGES/rpm.mo @@ -225,10 +217,12 @@ man/sk/man8/rpm.8.gz %%NLS%%share/locale/ms/LC_MESSAGES/rpm.mo %%NLS%%share/locale/nb/LC_MESSAGES/rpm.mo %%NLS%%share/locale/nl/LC_MESSAGES/rpm.mo +%%NLS%%share/locale/pa/LC_MESSAGES/rpm.mo %%NLS%%share/locale/pl/LC_MESSAGES/rpm.mo %%NLS%%share/locale/pt/LC_MESSAGES/rpm.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/rpm.mo %%NLS%%share/locale/ru/LC_MESSAGES/rpm.mo +%%NLS%%share/locale/si/LC_MESSAGES/rpm.mo %%NLS%%share/locale/sk/LC_MESSAGES/rpm.mo %%NLS%%share/locale/sl/LC_MESSAGES/rpm.mo %%NLS%%share/locale/sr/LC_MESSAGES/rpm.mo