diff --git a/misc/librepo/Makefile b/misc/librepo/Makefile index 55c3179e1d19..92eac797b2b0 100644 --- a/misc/librepo/Makefile +++ b/misc/librepo/Makefile @@ -1,55 +1,57 @@ PORTNAME= librepo -DISTVERSION= 1.20.0 +DISTVERSION= 1.21.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}gpg>=2.0.0:security/py-gpg@${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 +# test fails, see https://github.com/rpm-software-management/librepo/issues/389 + .include diff --git a/misc/librepo/distinfo b/misc/librepo/distinfo index 395c74616046..4e55b6cc2b25 100644 --- a/misc/librepo/distinfo +++ b/misc/librepo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1762719433 -SHA256 (rpm-software-management-librepo-1.20.0_GH0.tar.gz) = c21dd3caefe97ea58bc865f92095a9d2db2ec8aab49d0c714d4742094db930b6 -SIZE (rpm-software-management-librepo-1.20.0_GH0.tar.gz) = 844583 +TIMESTAMP = 1789264460 +SHA256 (rpm-software-management-librepo-1.21.1_GH0.tar.gz) = 85a9dec2f48976b0d800aa7692346fc2967b6195c0e524195f02a110535010e0 +SIZE (rpm-software-management-librepo-1.21.1_GH0.tar.gz) = 850474 diff --git a/misc/librepo/files/patch-CMakeLists.txt b/misc/librepo/files/patch-CMakeLists.txt index a67abdaa9a1c..ec5ba6a7218c 100644 --- a/misc/librepo/files/patch-CMakeLists.txt +++ b/misc/librepo/files/patch-CMakeLists.txt @@ -1,22 +1,22 @@ ---- CMakeLists.txt.orig 2024-03-26 13:28:08 UTC +--- CMakeLists.txt.orig 2026-09-09 07:53:37 UTC +++ CMakeLists.txt -@@ -32,7 +32,7 @@ PKG_CHECK_MODULES(GLIB2 glib-2.0>=2.66 gio-2.0 REQUIRE +@@ -36,7 +36,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) -@@ -115,8 +115,8 @@ IF (ENABLE_PYTHON) +@@ -130,8 +130,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 5d480278b981..0b9185bb9863 100644 --- a/misc/librepo/files/patch-librepo_CMakeLists.txt +++ b/misc/librepo/files/patch-librepo_CMakeLists.txt @@ -1,29 +1,30 @@ --- librepo/CMakeLists.txt.orig 2024-03-26 13:28:08 UTC +++ librepo/CMakeLists.txt @@ -18,7 +18,8 @@ LIST(APPEND librepo_SRCS url_substitution.c util.c xmlparser.c - yum.c) + yum.c + xattr.c) IF(USE_GPGME) LIST(APPEND librepo_SRCS gpg_gpgme.c) @@ -68,6 +69,7 @@ TARGET_LINK_LIBRARIES(librepo ${CURL_LIBRARY} ${LIBCRYPTO_LIBRARIES} ${GLIB2_LIBRARIES} + crypto ssl ) 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_librepo.pc.cmake b/misc/librepo/files/patch-librepo_librepo.pc.cmake index 240ce9474af6..358134de9c4c 100644 --- a/misc/librepo/files/patch-librepo_librepo.pc.cmake +++ b/misc/librepo/files/patch-librepo_librepo.pc.cmake @@ -1,11 +1,11 @@ ---- librepo/librepo.pc.cmake.orig 2024-11-04 16:54:08 UTC +--- librepo/librepo.pc.cmake.orig 2026-09-09 07:53:37 UTC +++ librepo/librepo.pc.cmake @@ -6,7 +6,7 @@ Requires: glib-2.0 Description: Repodata downloading library. Version: @VERSION@ Requires: glib-2.0 --Requires.private: libcurl openssl libxml-2.0 @PKGCONF_DEPENDENCY_ZCK@ -+Requires.private: libcurl libxml-2.0 @PKGCONF_DEPENDENCY_ZCK@ +-Requires.private: libcurl openssl libxml-2.0 gio-2.0 @PKGCONF_DEPENDENCY_ZCK@ @PKGCONF_REQUIRES_SELINUX@ ++Requires.private: libcurl libxml-2.0 gio-2.0 @PKGCONF_DEPENDENCY_ZCK@ @PKGCONF_REQUIRES_SELINUX@ Libs: -L${libdir} -lrepo Libs.private: -lgpgme -lgpg-error Cflags: -I${includedir} -D_FILE_OFFSET_BITS=64