diff --git a/misc/librepo/Makefile b/misc/librepo/Makefile index 0cb2651d04c0..c9458dfe999c 100644 --- a/misc/librepo/Makefile +++ b/misc/librepo/Makefile @@ -1,54 +1,55 @@ PORTNAME= librepo -DISTVERSION= 1.17.0 +DISTVERSION= 1.17.1 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org COMMENT= Library downloading repository metadata WWW= https://github.com/rpm-software-management/librepo LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libassuan.so:security/libassuan \ libcurl.so:ftp/curl \ libgpg-error.so:security/libgpg-error \ libgpgme.so:security/gpgme TEST_DEPENDS= bash:shells/bash \ check>0:devel/check \ ${PYTHON_PKGNAMEPREFIX}gpgme>0:security/py-gpgme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xattr>0:devel/py-xattr@${PY_FLAVOR} USES= cpe gettext-runtime gnome cmake:testing localbase:ldflags pkgconfig python shebangfix ssl CPE_VENDOR= redhat USE_GNOME= glib20 libxml2 USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= rpm-software-management SHEBANG_FILES= tests/run_tests.sh.in SHEBANG_GLOB= *.sh CFLAGS+= -I${WRKSRC}/librepo +CMAKE_ARGS= -DFREEBSD_PYTHON_VERSION=${PYTHON_VER} CMAKE_OFF= ENABLE_DOCS ENABLE_TESTS \ ENABLE_SELINUX CMAKE_TESTING_ON= ENABLE_TESTS OPTIONS_DEFINE= PYTHON ZCHUNK OPTIONS_DEFAULT= ZCHUNK OPTIONS_SUB= yes PYTHON_USES= python PYTHON_CMAKE_BOOL= ENABLE_PYTHON PYTHON_CMAKE_ON= -DPYTHON_DESIRED=${PYTHON_MAJOR_VER} ZCHUNK_DESC= Build with zchunk support ZCHUNK_CMAKE_BOOL= WITH_ZCHUNK ZCHUNK_LIB_DEPENDS= libzck.so:archivers/zchunk post-patch: @${RLN} ${FILESDIR}/xattr.c ${WRKSRC}/librepo/xattr.c @${RLN} ${FILESDIR}/xattr.h ${WRKSRC}/librepo/xattr.h .include diff --git a/misc/librepo/distinfo b/misc/librepo/distinfo index 908cd812b522..b65e8028dcbc 100644 --- a/misc/librepo/distinfo +++ b/misc/librepo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1704178027 -SHA256 (rpm-software-management-librepo-1.17.0_GH0.tar.gz) = ae707c2b9d72c2eaeecc9a5370273a99987d9c6979517b4ad433ae920b65d993 -SIZE (rpm-software-management-librepo-1.17.0_GH0.tar.gz) = 840253 +TIMESTAMP = 1711520106 +SHA256 (rpm-software-management-librepo-1.17.1_GH0.tar.gz) = 16e4158d6ce8a8536cc80dc327efb4ad53acf9181175b80cb9ef17cbda53cb8f +SIZE (rpm-software-management-librepo-1.17.1_GH0.tar.gz) = 840461 diff --git a/misc/librepo/files/patch-CMakeLists.txt b/misc/librepo/files/patch-CMakeLists.txt index 237be9cf80e3..a67abdaa9a1c 100644 --- a/misc/librepo/files/patch-CMakeLists.txt +++ b/misc/librepo/files/patch-CMakeLists.txt @@ -1,11 +1,22 @@ ---- CMakeLists.txt.orig 2023-08-01 06:48:08 UTC +--- CMakeLists.txt.orig 2024-03-26 13:28:08 UTC +++ CMakeLists.txt -@@ -29,7 +29,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SO +@@ -32,7 +32,7 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0>=2.66 gio-2.0 REQUIRE FIND_PACKAGE(PkgConfig) PKG_CHECK_MODULES(GLIB2 glib-2.0>=2.66 gio-2.0 REQUIRED) -PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl) +#PKG_SEARCH_MODULE(LIBCRYPTO REQUIRED libcrypto openssl) PKG_CHECK_MODULES(LIBXML2 libxml-2.0 REQUIRED) FIND_PACKAGE(CURL 7.52.0 REQUIRED) - FIND_PACKAGE(Gpgme REQUIRED) + +@@ -115,8 +115,8 @@ IF (ENABLE_PYTHON) + # Python stuff + + IF (ENABLE_PYTHON) +- FIND_PACKAGE (PythonInterp 3 EXACT REQUIRED) +- FIND_PACKAGE (PythonLibs REQUIRED) ++ FIND_PACKAGE (PythonInterp ${FREEBSD_PYTHON_VERSION} EXACT REQUIRED) ++ FIND_PACKAGE (PythonLibs ${FREEBSD_PYTHON_VERSION} EXACT REQUIRED) + ENDIF (ENABLE_PYTHON) + + # Subdirs diff --git a/misc/librepo/files/patch-librepo_CMakeLists.txt b/misc/librepo/files/patch-librepo_CMakeLists.txt index b6d57f76719f..5d480278b981 100644 --- a/misc/librepo/files/patch-librepo_CMakeLists.txt +++ b/misc/librepo/files/patch-librepo_CMakeLists.txt @@ -1,29 +1,29 @@ ---- librepo/CMakeLists.txt.orig 2022-12-09 12:47:26 UTC +--- librepo/CMakeLists.txt.orig 2024-03-26 13:28:08 UTC +++ librepo/CMakeLists.txt -@@ -18,7 +18,8 @@ SET (librepo_SRCS +@@ -18,7 +18,8 @@ LIST(APPEND librepo_SRCS url_substitution.c util.c xmlparser.c - yum.c) + yum.c + xattr.c) - SET(librepo_HEADERS - checksum.h -@@ -52,6 +53,7 @@ TARGET_LINK_LIBRARIES(librepo + IF(USE_GPGME) + LIST(APPEND librepo_SRCS gpg_gpgme.c) +@@ -68,6 +69,7 @@ TARGET_LINK_LIBRARIES(librepo + ${CURL_LIBRARY} ${LIBCRYPTO_LIBRARIES} - ${GPGME_VANILLA_LIBRARIES} ${GLIB2_LIBRARIES} + crypto ssl ) - IF (WITH_ZCHUNK) - TARGET_LINK_LIBRARIES(librepo ${ZCHUNKLIB_LIBRARIES}) -@@ -73,6 +75,8 @@ INSTALL(TARGETS librepo LIBRARY DESTINATION ${CMAKE_IN + IF (USE_GPGME) + TARGET_LINK_LIBRARIES(librepo ${GPGME_VANILLA_LIBRARIES}) +@@ -98,6 +100,8 @@ INSTALL(FILES "${CMAKE_BINARY_DIR}/librepo.pc" INSTALL(FILES "${CMAKE_BINARY_DIR}/librepo.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") +if (ENABLE_PYTHON) IF (ENABLE_PYTHON) +endif() ADD_SUBDIRECTORY(python) ENDIF (ENABLE_PYTHON) diff --git a/misc/librepo/files/patch-librepo_gpg__gpgme.c b/misc/librepo/files/patch-librepo_gpg__gpgme.c deleted file mode 100644 index d6a1a7a99613..000000000000 --- a/misc/librepo/files/patch-librepo_gpg__gpgme.c +++ /dev/null @@ -1,10 +0,0 @@ ---- librepo/gpg_gpgme.c.orig 2024-01-12 02:28:14 UTC -+++ librepo/gpg_gpgme.c -@@ -144,6 +144,7 @@ exit: - } - freecon(old_default_context); - #endif -+ return; // w/out this there's error only on i386: librepo/gpg_gpgme.c:147:1: error: expected statement - } - - static gpgme_ctx_t diff --git a/misc/librepo/files/patch-tests_test__checksum.c b/misc/librepo/files/patch-tests_test__checksum.c index 6af6602ee9af..a38bafed4b44 100644 --- a/misc/librepo/files/patch-tests_test__checksum.c +++ b/misc/librepo/files/patch-tests_test__checksum.c @@ -1,11 +1,11 @@ ---- tests/test_checksum.c.orig 2020-09-20 19:02:27 UTC +--- tests/test_checksum.c.orig 2024-03-26 13:28:08 UTC +++ tests/test_checksum.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include "xattr.h" #include #include "librepo/util.h"