diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile index d10ea97f6f2a..f131490ea928 100644 --- a/archivers/rpm4/Makefile +++ b/archivers/rpm4/Makefile @@ -1,82 +1,80 @@ PORTNAME= rpm -PORTVERSION= 4.18.1 -PORTREVISION= 2 +PORTVERSION= 4.18.2 CATEGORIES= archivers MASTER_SITES= http://ftp.rpm.org/releases/rpm-${PORTVERSION:R}.x/ PKGNAMESUFFIX= 4 MAINTAINER= rodrigo@FreeBSD.org COMMENT= Red Hat Package Manager WWW= https://rpm.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= gsed:textproc/gsed \ - ${LOCALBASE}/lib/libelf.so:devel/elfutils -LIB_DEPENDS= libpopt.so:devel/popt \ - libnss3.so:security/nss \ - libzstd.so:archivers/zstd \ +BUILD_DEPENDS= ${LOCALBASE}/lib/libelf.so:devel/elfutils \ + gsed:textproc/gsed +LIB_DEPENDS= libarchive.so:archivers/libarchive \ + libdb-5.3.so:databases/db5 \ + libelf.so:devel/elfutils \ libgcrypt.so:security/libgcrypt \ - libelf.so:devel/elfutils -RUN_DEPENDS= bash:shells/bash \ - gxargs:misc/findutils \ - ${LOCALBASE}/lib/libelf.so:devel/elfutils + libnss3.so:security/nss \ + libpopt.so:devel/popt \ + libzstd.so:archivers/zstd +RUN_DEPENDS= ${LOCALBASE}/lib/libelf.so:devel/elfutils \ + bash:shells/bash \ + gxargs:misc/findutils -USES= alias bdb sqlite cpe gmake iconv libarchive libtool \ - lua pathfix pkgconfig shebangfix tar:bzip2 +USES= alias bdb cpe gmake iconv libarchive libtool lua pathfix \ + pkgconfig readline shebangfix sqlite tar:bzip2 USE_LDCONFIG= yes -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 \ +SHEBANG_FILES= scripts/brp-compress scripts/check-prereqs \ + scripts/check-rpaths-worker scripts/find-lang.sh \ + scripts/fontconfig.prov scripts/ocamldeps.sh scripts/perl.prov \ + scripts/perl.req scripts/pkgconfigdeps.sh \ scripts/rpm_macros_provides.sh GNU_CONFIGURE= yes -CONFIGURE_ARGS= --enable-sqlite=yes\ - --with-popt-prefix="${LOCALBASE}" \ - --sysconfdir=${PREFIX}/etc \ +CONFIGURE_ARGS= --enable-sqlite=yes \ --localstatedir=/var \ + --sysconfdir=${PREFIX}/etc \ + --with-popt-prefix="${LOCALBASE}" \ --without-javaglue \ am_cv_python_version=${PYTHON_VER}${PYTHON_ABIVER} CONFIGURE_ENV= LUA_CFLAGS=-I${LUA_INCDIR} \ LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER} -lm" INSTALL_TARGET= install-strip -CPPFLAGS+= -I${LOCALBASE}/include \ - -I${LOCALBASE}/include/nspr -I${LOCALBASE}/include/nss/nss \ - -I${BDB_INCLUDE_DIR} -I${LUA_INCDIR} -LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/nss \ - -L${BDB_LIB_DIR} -L${LUA_LIBDIR} +CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/nspr \ + -I${LOCALBASE}/include/nss/nss -I${BDB_INCLUDE_DIR} \ + -I${LUA_INCDIR} +LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/nss -L${BDB_LIB_DIR} \ + -L${LUA_LIBDIR} CONFLICTS_INSTALL= rpm2cpio # bin/rpm2cpio BINARY_ALIAS= sed=${LOCALBASE}/bin/gsed -PLIST_SUB= VERSION=${PORTVERSION} \ - OPSYS=${OPSYS:tl} +PLIST_SUB= OPSYS=${OPSYS:tl} \ + VERSION=${PORTVERSION} -OPTIONS_DEFINE= PYTHON PLUGINS NLS -OPTIONS_DEFAULT=PYTHON -OPTIONS_SUB= yes +OPTIONS_DEFINE= NLS PLUGINS PYTHON +OPTIONS_DEFAULT= PYTHON +OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NLS_LIBS= -lintl -PLUGINS_LIB_DEPENDS= libdbus-1.so:devel/dbus -PLUGINS_CONFIGURE_ENABLE=plugins -PYTHON_USES= python -PYTHON_CONFIGURE_ENABLE=python +PLUGINS_LIB_DEPENDS= libdbus-1.so:devel/dbus +PLUGINS_CONFIGURE_ENABLE= plugins +PYTHON_USES= python +PYTHON_CONFIGURE_ENABLE= python 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-strip-static-archive \ ${WRKSRC}/scripts/check-buildroot \ ${WRKSRC}/scripts/check-rpaths \ ${WRKSRC}/scripts/vpkg-provides.sh .include diff --git a/archivers/rpm4/distinfo b/archivers/rpm4/distinfo index 1df8ee1744d3..380dd3fd5e6f 100644 --- a/archivers/rpm4/distinfo +++ b/archivers/rpm4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689439085 -SHA256 (rpm-4.18.1.tar.bz2) = 37f3b42c0966941e2ad3f10fde3639824a6591d07197ba8fd0869ca0779e1f56 -SIZE (rpm-4.18.1.tar.bz2) = 6396363 +TIMESTAMP = 1703000590 +SHA256 (rpm-4.18.2.tar.bz2) = ba7eee1bc2c6f83be73c0a40d159c625cbaed976b3ac044233404fb25ae1b979 +SIZE (rpm-4.18.2.tar.bz2) = 6494550 diff --git a/archivers/rpm4/files/patch-docs_Makefile.in b/archivers/rpm4/files/patch-docs_Makefile.in index ecdd91bd159d..b84272277586 100644 --- a/archivers/rpm4/files/patch-docs_Makefile.in +++ b/archivers/rpm4/files/patch-docs_Makefile.in @@ -1,11 +1,11 @@ ---- docs/Makefile.in.orig 2023-07-21 09:25:20 UTC +--- docs/Makefile.in.orig 2023-12-19 15:56:53 UTC +++ docs/Makefile.in -@@ -442,7 +442,7 @@ target_alias = @target_alias@ +@@ -442,7 +442,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -@PANDOC_TRUE@SUBDIRS = man +SUBDIRS = man - EXTRA_DIST = _layouts/default.html _layouts/favicon.ico index.md \ - manual/index.md manual/arch_dependencies.md \ + EXTRA_DIST = _layouts/default.html _layouts/favicon.ico README.md \ + index.md manual/index.md manual/arch_dependencies.md \ manual/autosetup.md manual/boolean_dependencies.md \ diff --git a/archivers/rpm4/files/patch-lib_backend_sqlite.c b/archivers/rpm4/files/patch-lib_backend_sqlite.c deleted file mode 100644 index 80e5042eda06..000000000000 --- a/archivers/rpm4/files/patch-lib_backend_sqlite.c +++ /dev/null @@ -1,24 +0,0 @@ ---- lib/backend/sqlite.c.orig 2023-09-06 20:53:16 UTC -+++ lib/backend/sqlite.c -@@ -44,13 +44,6 @@ static void rpm_match3(sqlite3_context *sctx, int argc - sqlite3_result_int(sctx, match); - } - --static void errCb(void *data, int err, const char *msg) --{ -- rpmdb rdb = data; -- rpmlog(RPMLOG_WARNING, "%s: %s: %s\n", -- rdb->db_descr, sqlite3_errstr(err), msg); --} -- - static int dbiCursorReset(dbiCursor dbc) - { - if (dbc->stmt) { -@@ -170,7 +163,6 @@ static int sqlite_init(rpmdb rdb, const char * dbhome) - * the "database is locked" errors at every cost - */ - sqlite3_busy_timeout(sdb, 10000); -- sqlite3_config(SQLITE_CONFIG_LOG, errCb, rdb); - - sqlexec(sdb, "PRAGMA secure_delete = OFF"); - sqlexec(sdb, "PRAGMA case_sensitive_like = ON"); diff --git a/archivers/rpm4/files/patch-tools_rpmuncompress.c b/archivers/rpm4/files/patch-tools_rpmuncompress.c index 23dc0cc83dea..301b52c24956 100644 --- a/archivers/rpm4/files/patch-tools_rpmuncompress.c +++ b/archivers/rpm4/files/patch-tools_rpmuncompress.c @@ -1,12 +1,13 @@ ---- tools/rpmuncompress.c.orig 2022-08-30 11:42:23 UTC +--- tools/rpmuncompress.c.orig 2023-12-19 16:39:32 UTC +++ tools/rpmuncompress.c -@@ -1,7 +1,9 @@ +@@ -1,8 +1,10 @@ #include "system.h" +#include #include + #include #include +#include #include #include diff --git a/archivers/rpm4/pkg-plist b/archivers/rpm4/pkg-plist index ad65f23362c8..6e043a92e616 100644 --- a/archivers/rpm4/pkg-plist +++ b/archivers/rpm4/pkg-plist @@ -1,262 +1,262 @@ bin/gendiff bin/rpm bin/rpm2archive bin/rpm2cpio bin/rpmbuild bin/rpmdb bin/rpmgraph bin/rpmkeys bin/rpmlua bin/rpmquery bin/rpmsign bin/rpmspec bin/rpmverify %%PLUGINS%%etc/dbus-1/system.d/org.rpm.conf include/rpm/argv.h include/rpm/header.h include/rpm/rpmarchive.h 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 include/rpm/rpmfi.h include/rpm/rpmfiles.h include/rpm/rpmfileutil.h include/rpm/rpmio.h include/rpm/rpmkeyring.h include/rpm/rpmlib.h include/rpm/rpmlog.h include/rpm/rpmmacro.h include/rpm/rpmpgp.h include/rpm/rpmpol.h include/rpm/rpmprob.h include/rpm/rpmps.h include/rpm/rpmsign.h include/rpm/rpmspec.h include/rpm/rpmsq.h include/rpm/rpmstring.h include/rpm/rpmstrpool.h include/rpm/rpmsw.h include/rpm/rpmtag.h include/rpm/rpmtd.h include/rpm/rpmte.h include/rpm/rpmts.h include/rpm/rpmtypes.h include/rpm/rpmurl.h include/rpm/rpmutil.h include/rpm/rpmver.h lib/librpm.so lib/librpm.so.9 -lib/librpm.so.9.4.0 +lib/librpm.so.9.4.1 lib/librpmbuild.so lib/librpmbuild.so.9 -lib/librpmbuild.so.9.4.0 +lib/librpmbuild.so.9.4.1 lib/librpmio.so lib/librpmio.so.9 -lib/librpmio.so.9.4.0 +lib/librpmio.so.9.4.1 lib/librpmsign.so lib/librpmsign.so.9 -lib/librpmsign.so.9.4.0 +lib/librpmsign.so.9.4.1 %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/_rpm.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm/transaction.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/rpm-%%VERSION%%-py%%PYTHON_VER%%.egg-info %%PLUGINS%%lib/rpm-plugins/dbus_announce.so %%PLUGINS%%lib/rpm-plugins/prioreset.so %%PLUGINS%%lib/rpm-plugins/syslog.so %%PLUGINS%%lib/rpm-plugins/systemd_inhibit.so lib/rpm/brp-compress lib/rpm/brp-elfperms lib/rpm/brp-remove-la-files lib/rpm/brp-strip lib/rpm/brp-strip-comment-note lib/rpm/brp-strip-static-archive lib/rpm/check-buildroot lib/rpm/check-files lib/rpm/check-prereqs lib/rpm/check-rpaths lib/rpm/check-rpaths-worker lib/rpm/elfdeps lib/rpm/fileattrs/debuginfo.attr lib/rpm/fileattrs/desktop.attr lib/rpm/fileattrs/elf.attr lib/rpm/fileattrs/font.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/rpm_macro.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/macros lib/rpm/mkinstalldirs lib/rpm/ocamldeps.sh lib/rpm/perl.prov lib/rpm/perl.req lib/rpm/pkgconfigdeps.sh lib/rpm/platform/aarch64-%%OPSYS%%/macros lib/rpm/platform/alpha-%%OPSYS%%/macros lib/rpm/platform/alphaev5-%%OPSYS%%/macros lib/rpm/platform/alphaev56-%%OPSYS%%/macros lib/rpm/platform/alphaev6-%%OPSYS%%/macros lib/rpm/platform/alphaev67-%%OPSYS%%/macros lib/rpm/platform/alphapca56-%%OPSYS%%/macros lib/rpm/platform/amd64-%%OPSYS%%/macros lib/rpm/platform/armv3l-%%OPSYS%%/macros lib/rpm/platform/armv4b-%%OPSYS%%/macros lib/rpm/platform/armv4l-%%OPSYS%%/macros lib/rpm/platform/armv5tejl-%%OPSYS%%/macros lib/rpm/platform/armv5tel-%%OPSYS%%/macros lib/rpm/platform/armv5tl-%%OPSYS%%/macros lib/rpm/platform/armv6hl-%%OPSYS%%/macros lib/rpm/platform/armv6l-%%OPSYS%%/macros lib/rpm/platform/armv7hl-%%OPSYS%%/macros lib/rpm/platform/armv7hnl-%%OPSYS%%/macros lib/rpm/platform/armv7l-%%OPSYS%%/macros lib/rpm/platform/armv8hl-%%OPSYS%%/macros lib/rpm/platform/armv8l-%%OPSYS%%/macros lib/rpm/platform/athlon-%%OPSYS%%/macros lib/rpm/platform/geode-%%OPSYS%%/macros lib/rpm/platform/i386-%%OPSYS%%/macros lib/rpm/platform/i486-%%OPSYS%%/macros 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 lib/rpm/platform/mips64el-%%OPSYS%%/macros lib/rpm/platform/mips64r6-%%OPSYS%%/macros lib/rpm/platform/mips64r6el-%%OPSYS%%/macros lib/rpm/platform/mipsel-%%OPSYS%%/macros lib/rpm/platform/mipsr6-%%OPSYS%%/macros lib/rpm/platform/mipsr6el-%%OPSYS%%/macros lib/rpm/platform/noarch-%%OPSYS%%/macros lib/rpm/platform/pentium3-%%OPSYS%%/macros lib/rpm/platform/pentium4-%%OPSYS%%/macros lib/rpm/platform/ppc-%%OPSYS%%/macros lib/rpm/platform/ppc32dy4-%%OPSYS%%/macros lib/rpm/platform/ppc64-%%OPSYS%%/macros lib/rpm/platform/ppc64iseries-%%OPSYS%%/macros lib/rpm/platform/ppc64le-%%OPSYS%%/macros lib/rpm/platform/ppc64p7-%%OPSYS%%/macros lib/rpm/platform/ppc64pseries-%%OPSYS%%/macros lib/rpm/platform/ppc8260-%%OPSYS%%/macros lib/rpm/platform/ppc8560-%%OPSYS%%/macros lib/rpm/platform/ppciseries-%%OPSYS%%/macros lib/rpm/platform/ppcpseries-%%OPSYS%%/macros lib/rpm/platform/riscv64-%%OPSYS%%/macros lib/rpm/platform/s390-%%OPSYS%%/macros lib/rpm/platform/s390x-%%OPSYS%%/macros lib/rpm/platform/sh-%%OPSYS%%/macros lib/rpm/platform/sh3-%%OPSYS%%/macros lib/rpm/platform/sh4-%%OPSYS%%/macros lib/rpm/platform/sh4a-%%OPSYS%%/macros lib/rpm/platform/sparc-%%OPSYS%%/macros lib/rpm/platform/sparc64-%%OPSYS%%/macros lib/rpm/platform/sparc64v-%%OPSYS%%/macros 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 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 man/fr/man8/rpm.8.gz man/ja/man8/rpm.8.gz man/ja/man8/rpm2cpio.8.gz man/ja/man8/rpmbuild.8.gz man/ja/man8/rpmgraph.8.gz man/ko/man8/rpm.8.gz man/ko/man8/rpm2cpio.8.gz man/man1/gendiff.1.gz man/man8/rpm-misc.8.gz %%PLUGINS%%man/man8/rpm-plugin-dbus-announce.8.gz %%PLUGINS%%man/man8/rpm-plugin-prioreset.8.gz %%PLUGINS%%man/man8/rpm-plugin-syslog.8.gz %%PLUGINS%%man/man8/rpm-plugin-systemd-inhibit.8.gz %%PLUGINS%%man/man8/rpm-plugins.8.gz man/man8/rpm.8.gz man/man8/rpm2archive.8.gz man/man8/rpm2cpio.8.gz man/man8/rpmbuild.8.gz 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 man/pl/man8/rpm.8.gz man/pl/man8/rpm2cpio.8.gz man/pl/man8/rpmbuild.8.gz man/pl/man8/rpmdeps.8.gz man/pl/man8/rpmgraph.8.gz man/ru/man8/rpm.8.gz man/ru/man8/rpm2cpio.8.gz man/sk/man8/rpm.8.gz %%NLS%%share/locale/ar/LC_MESSAGES/rpm.mo %%NLS%%share/locale/br/LC_MESSAGES/rpm.mo %%NLS%%share/locale/ca/LC_MESSAGES/rpm.mo %%NLS%%share/locale/cmn/LC_MESSAGES/rpm.mo %%NLS%%share/locale/cs/LC_MESSAGES/rpm.mo %%NLS%%share/locale/da/LC_MESSAGES/rpm.mo %%NLS%%share/locale/de/LC_MESSAGES/rpm.mo %%NLS%%share/locale/el/LC_MESSAGES/rpm.mo %%NLS%%share/locale/eo/LC_MESSAGES/rpm.mo %%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 %%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 %%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 %%NLS%%share/locale/sr@latin/LC_MESSAGES/rpm.mo %%NLS%%share/locale/sv/LC_MESSAGES/rpm.mo %%NLS%%share/locale/te/LC_MESSAGES/rpm.mo %%NLS%%share/locale/tr/LC_MESSAGES/rpm.mo %%NLS%%share/locale/uk/LC_MESSAGES/rpm.mo %%NLS%%share/locale/vi/LC_MESSAGES/rpm.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/rpm.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/rpm.mo %%PLUGINS%%@dir lib/rpm-plugins @dir lib/rpm/lua @dir lib/rpm/macros.d