Date: Tue, 19 Dec 2023 21:19:01 GMT From: Rodrigo Osorio <rodrigo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7ab114bc6e7e - main - archivers/rpm4: Update to 4.18.2 Message-ID: <202312192119.3BJLJ1WF001731@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rodrigo: URL: https://cgit.FreeBSD.org/ports/commit/?id=7ab114bc6e7e3b2a71f8261e2d3127ae5137296a commit 7ab114bc6e7e3b2a71f8261e2d3127ae5137296a Author: Rodrigo Osorio <rodrigo@FreeBSD.org> AuthorDate: 2023-12-19 20:59:08 +0000 Commit: Rodrigo Osorio <rodrigo@FreeBSD.org> CommitDate: 2023-12-19 21:18:35 +0000 archivers/rpm4: Update to 4.18.2 Cangelog: https://rpm.org/wiki/Releases/4.18.2.html --- archivers/rpm4/Makefile | 72 ++++++++++++------------ archivers/rpm4/distinfo | 6 +- archivers/rpm4/files/patch-docs_Makefile.in | 8 +-- archivers/rpm4/files/patch-lib_backend_sqlite.c | 24 -------- archivers/rpm4/files/patch-tools_rpmuncompress.c | 5 +- archivers/rpm4/pkg-plist | 8 +-- 6 files changed, 49 insertions(+), 74 deletions(-) diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile index d10ea97f6f2a..f131490ea928 100644 --- a/archivers/rpm4/Makefile +++ b/archivers/rpm4/Makefile @@ -1,6 +1,5 @@ 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 @@ -12,67 +11,66 @@ 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/\<xargs\>/gxargs/g' \ ${WRKSRC}/scripts/brp-strip-static-archive \ ${WRKSRC}/scripts/check-buildroot \ 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,10 +1,11 @@ ---- 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 <sys/wait.h> #include <popt.h> + #include <libgen.h> #include <errno.h> +#include <libgen.h> #include <stdio.h> 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 @@ -51,16 +51,16 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202312192119.3BJLJ1WF001731>