diff --git a/sysutils/libdnf/Makefile b/sysutils/libdnf/Makefile index 6d8780a2ca0b..4eed3623b829 100644 --- a/sysutils/libdnf/Makefile +++ b/sysutils/libdnf/Makefile @@ -1,66 +1,56 @@ PORTNAME= libdnf -DISTVERSION= 0.70.2 -PORTREVISION= 2 +DISTVERSION= 0.73.4 CATEGORIES= sysutils MAINTAINER= yuri@FreeBSD.org COMMENT= Dandified YUM, the next-generation version of YUM WWW= https://github.com/rpm-software-management/libdnf LICENSE= LGPL21 # no LICENSE tag for Version 2.1 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= check>0:devel/check -LIB_DEPENDS= libassuan.so:security/libassuan \ - libcurl.so:ftp/curl \ +LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 \ libffi.so:devel/libffi \ - libgcrypt.so:security/libgcrypt \ - libgpgme.so:security/gpgme \ - libgpg-error.so:security/libgpg-error \ - libidn2.so:dns/libidn2 \ libjson-c.so:devel/json-c \ libmodulemd.so:misc/libmodulemd \ libnghttp2.so:www/libnghttp2 \ - libpsl.so:dns/libpsl \ - libpcre.so:devel/pcre \ libpopt.so:devel/popt \ librepo.so:misc/librepo \ librpmio.so:archivers/rpm4 \ libsmartcols.so:devel/util-linux \ libsolv.so:misc/libsolv \ - libssh2.so:security/libssh2 \ - libunistring.so:devel/libunistring \ libyaml.so:textproc/libyaml \ libzstd.so:archivers/zstd TEST_DEPENDS= cppunit>0:devel/cppunit USES= cmake:testing compiler:c++11-lang gettext gnome lua pkgconfig sqlite ssl USE_GNOME= glib20 libxml2 USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= rpm-software-management CMAKE_OFF= BUILD_TESTNG WITH_GTKDOC WITH_HTML WITH_TESTS FREEBSD_INSTALL_DOCS CMAKE_TESTING_ON= BUILD_TESTNG WITH_TESTS # tests throw exceptions, see https://github.com/rpm-software-management/libdnf/issues/1581 BINARY_ALIAS= git=false OPTIONS_DEFINE= PYTHON ZCHUNK OPTIONS_DEFAULT= PYTHON OPTIONS_SUB= yes PYTHON_CMAKE_BOOL= WITH_BINDINGS PYTHON_USES= python PYTHON_CMAKE_ON= -DPYTHON_DESIRED=${PYTHON_MAJOR_VER} PYTHON_BUILD_DEPENDS= swig:devel/swig \ ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} ZCHUNK_DESC= With zchunk support ZCHUNK_CMAKE_BOOL= WITH_ZCHUNK ZCHUNK_BROKEN= Links with zchunk when WITH_ZCHUNK=OFF https://github.com/rpm-software-management/libdnf/issues/1515 # Tests fail to compile: ld: error: unable to find library -ltestshared, see https://github.com/rpm-software-management/libdnf/issues/1574 .include diff --git a/sysutils/libdnf/distinfo b/sysutils/libdnf/distinfo index 690b33fd9651..78460da75e18 100644 --- a/sysutils/libdnf/distinfo +++ b/sysutils/libdnf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1692034629 -SHA256 (rpm-software-management-libdnf-0.70.2_GH0.tar.gz) = 8f34e9f93dc767bb02d6f132b1e2614667b4b36ee98b8f1552df1a22d5ce9cbc -SIZE (rpm-software-management-libdnf-0.70.2_GH0.tar.gz) = 1155234 +TIMESTAMP = 1737971787 +SHA256 (rpm-software-management-libdnf-0.73.4_GH0.tar.gz) = bce14012d29d58867669fc606938f6fa84f037efcd9c802150fba6506356814c +SIZE (rpm-software-management-libdnf-0.73.4_GH0.tar.gz) = 1208308 diff --git a/sysutils/libdnf/files/patch-bindings_python_____init____.py b/sysutils/libdnf/files/patch-bindings_python_____init____.py deleted file mode 100644 index bec3b2534377..000000000000 --- a/sysutils/libdnf/files/patch-bindings_python_____init____.py +++ /dev/null @@ -1,21 +0,0 @@ -- from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273044 -- fix regex and duplicate rtti - ---- bindings/python/__init__.py.orig 2023-07-28 12:49:18 UTC -+++ bindings/python/__init__.py -@@ -6,11 +6,14 @@ from . import error - import sys, os - sys.setdlopenflags(os.RTLD_NOW | os.RTLD_GLOBAL) - from . import error --sys.setdlopenflags(os.RTLD_NOW) - -+# Other modules also need to be loaded with RTLD_GLOBAL to preserve uniqueness -+# of RTTI. There are code paths where an exception thrown in one module is -+# supposed to be caught in another. - from . import common_types - from . import conf - from . import module - from . import repo - from . import transaction - from . import utils -+sys.setdlopenflags(os.RTLD_NOW) diff --git a/sysutils/libdnf/files/patch-libdnf_repo_DependencySplitter.cpp b/sysutils/libdnf/files/patch-libdnf_repo_DependencySplitter.cpp deleted file mode 100644 index a6d20c22d23d..000000000000 --- a/sysutils/libdnf/files/patch-libdnf_repo_DependencySplitter.cpp +++ /dev/null @@ -1,14 +0,0 @@ -- from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273044 -- fix regex and duplicate rtti - ---- libdnf/repo/DependencySplitter.cpp.orig 2023-07-28 12:49:18 UTC -+++ libdnf/repo/DependencySplitter.cpp -@@ -29,7 +29,7 @@ static const Regex RELDEP_REGEX = - namespace libdnf { - - static const Regex RELDEP_REGEX = -- Regex("^(\\S*)\\s*(<=|>=|<|>|=|==)?\\s*(\\S*)$", REG_EXTENDED); -+ Regex("^([^[:space:]]*)[[:space:]]*(<=|>=|<|>|=|==)?[[:space:]]*([^[:space:]]*)$", REG_EXTENDED); - - static bool - getCmpFlags(int *cmp_type, std::string matchCmpType) diff --git a/sysutils/libdnf/pkg-plist b/sysutils/libdnf/pkg-plist index d3d4ce61bdbb..68641bfce8ff 100644 --- a/sysutils/libdnf/pkg-plist +++ b/sysutils/libdnf/pkg-plist @@ -1,129 +1,131 @@ include/libdnf/conf/Config.hpp include/libdnf/conf/ConfigMain.hpp include/libdnf/conf/ConfigParser.hpp include/libdnf/conf/ConfigRepo.hpp include/libdnf/conf/Option.hpp include/libdnf/conf/OptionBinds.hpp include/libdnf/conf/OptionBool.hpp include/libdnf/conf/OptionChild.hpp include/libdnf/conf/OptionEnum.hpp include/libdnf/conf/OptionNumber.hpp include/libdnf/conf/OptionPath.hpp include/libdnf/conf/OptionSeconds.hpp include/libdnf/conf/OptionString.hpp include/libdnf/conf/OptionStringList.hpp include/libdnf/config.h include/libdnf/dnf-advisory.h include/libdnf/dnf-advisorypkg.h include/libdnf/dnf-advisoryref.h include/libdnf/dnf-conf.h include/libdnf/dnf-context.h include/libdnf/dnf-db.h include/libdnf/dnf-enums.h include/libdnf/dnf-goal.h include/libdnf/dnf-keyring.h include/libdnf/dnf-lock.h include/libdnf/dnf-package.h include/libdnf/dnf-packagedelta.h include/libdnf/dnf-reldep-list.h include/libdnf/dnf-reldep.h include/libdnf/dnf-repo-loader.h include/libdnf/dnf-repo.h include/libdnf/dnf-rpmts.h include/libdnf/dnf-sack.h include/libdnf/dnf-state.h include/libdnf/dnf-transaction.h include/libdnf/dnf-types.h include/libdnf/dnf-utils.h include/libdnf/dnf-version.h include/libdnf/hy-goal.h include/libdnf/hy-nevra.h include/libdnf/hy-package.h include/libdnf/hy-packageset.h include/libdnf/hy-query.h include/libdnf/hy-repo.h include/libdnf/hy-selector.h include/libdnf/hy-subject.h include/libdnf/hy-types.h include/libdnf/hy-util.h include/libdnf/libdnf.h include/libdnf/log.hpp include/libdnf/nevra.hpp include/libdnf/nsvcap.hpp include/libdnf/plugin/plugin.h include/libdnf/utils/PreserveOrderMap.hpp include/libdnf/utils/logger.hpp lib/libdnf.so lib/libdnf.so.2 lib/libdnf/plugins/README %%PYTHON%%%%PYTHON_SITELIBDIR%%/hawkey/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/hawkey/_hawkey.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf-0.73.4.dist-info/METADATA %%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/__init__.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/_common_types.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/_conf.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/_error.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/_module.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/_repo.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/_smartcols.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/_transaction.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/_utils.so %%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/common_types.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/conf.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/error.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/module.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/repo.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/smartcols.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/transaction.py %%PYTHON%%%%PYTHON_SITELIBDIR%%/libdnf/utils.py libdata/pkgconfig/libdnf.pc share/locale/as/LC_MESSAGES/libdnf.mo share/locale/bg/LC_MESSAGES/libdnf.mo share/locale/bn/LC_MESSAGES/libdnf.mo share/locale/bn_IN/LC_MESSAGES/libdnf.mo share/locale/ca/LC_MESSAGES/libdnf.mo share/locale/cs/LC_MESSAGES/libdnf.mo share/locale/da/LC_MESSAGES/libdnf.mo share/locale/de/LC_MESSAGES/libdnf.mo share/locale/el/LC_MESSAGES/libdnf.mo share/locale/es/LC_MESSAGES/libdnf.mo share/locale/eu/LC_MESSAGES/libdnf.mo share/locale/fa/LC_MESSAGES/libdnf.mo share/locale/fi/LC_MESSAGES/libdnf.mo share/locale/fil/LC_MESSAGES/libdnf.mo share/locale/fr/LC_MESSAGES/libdnf.mo share/locale/fur/LC_MESSAGES/libdnf.mo share/locale/gu/LC_MESSAGES/libdnf.mo share/locale/hi/LC_MESSAGES/libdnf.mo share/locale/hu/LC_MESSAGES/libdnf.mo share/locale/ia/LC_MESSAGES/libdnf.mo share/locale/id/LC_MESSAGES/libdnf.mo share/locale/is/LC_MESSAGES/libdnf.mo share/locale/it/LC_MESSAGES/libdnf.mo share/locale/ja/LC_MESSAGES/libdnf.mo +share/locale/ka/LC_MESSAGES/libdnf.mo share/locale/kn/LC_MESSAGES/libdnf.mo share/locale/ko/LC_MESSAGES/libdnf.mo share/locale/mai/LC_MESSAGES/libdnf.mo share/locale/ml/LC_MESSAGES/libdnf.mo share/locale/mr/LC_MESSAGES/libdnf.mo share/locale/nb/LC_MESSAGES/libdnf.mo share/locale/nl/LC_MESSAGES/libdnf.mo share/locale/or/LC_MESSAGES/libdnf.mo share/locale/pa/LC_MESSAGES/libdnf.mo share/locale/pl/LC_MESSAGES/libdnf.mo share/locale/pt/LC_MESSAGES/libdnf.mo share/locale/pt_BR/LC_MESSAGES/libdnf.mo share/locale/ru/LC_MESSAGES/libdnf.mo share/locale/si/LC_MESSAGES/libdnf.mo share/locale/sk/LC_MESSAGES/libdnf.mo share/locale/sq/LC_MESSAGES/libdnf.mo share/locale/sr/LC_MESSAGES/libdnf.mo share/locale/sr@latin/LC_MESSAGES/libdnf.mo share/locale/sv/LC_MESSAGES/libdnf.mo share/locale/ta/LC_MESSAGES/libdnf.mo share/locale/te/LC_MESSAGES/libdnf.mo share/locale/th/LC_MESSAGES/libdnf.mo share/locale/tr/LC_MESSAGES/libdnf.mo share/locale/uk/LC_MESSAGES/libdnf.mo share/locale/zh_CN/LC_MESSAGES/libdnf.mo share/locale/zh_TW/LC_MESSAGES/libdnf.mo -%%PYTHON%%share/man/man3/hawkey.3.gz +share/man/man3/hawkey.3.gz