From nobody Sat Jan 28 08:34:41 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P3nmx46nlz3bLk9; Sat, 28 Jan 2023 08:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P3nmx3hPfz4TxP; Sat, 28 Jan 2023 08:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674894881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/M2+S8TNEde4F40cTRnDbM0ghGjX5IXYS4B8HP9Hh7E=; b=lzLodiRPaP0pbJHLGdubmKEfRkPdhYeej4AAe10iTO4yu/oK2s/pSJiwvdHM79Llt6vA7y vPL6/vzBphfBcOFM99XlxtcNHMrYs5XaphKknN3hACc+5jMqlsprmInYjNFy82hx5XAEXI m7CYBlZY7BYXdN5us779NWTdJkcB0/ILXRjqk0YnMRaXLJPlH99TbmwvdHjJJHUvO5zGdS hpx+DxhXAJqqEwOJVnGMXjKmHuqsO5J/MMK9Arul2G27D0vr7gACSZCDHL5XsMKR5uvUXU 8m4zex4exGoSYcUZg6iodREKNshGEIpMsaTwwObV/SrDIaMfS4qMEW6dCW1T/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674894881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/M2+S8TNEde4F40cTRnDbM0ghGjX5IXYS4B8HP9Hh7E=; b=f3ZNTmZYZ/nMcj0pDRK6V1N5fjgIe89JsVyG+h4HHL5yFwGmc47kqlC6OCMQJq5taMJIML Vs1/bwgKgZ0dxvS2pUYYrIuIW5/9fqOOajkmiFibUAWMIDIU3KF3lujVXcp/ce5g3J4CHH rSL1NtLZ7L/73Efy6ftW8d7h0DUHvqTJzaPhYpZFbUdigHmLeaffK1yzdYWbCLSxX/iBre Kar3tuOzfnL0NrrrlSq/OPbWcQRV3Y3LEIGCN3QqftlWlkQMyiESBifvoyN3LPliCUEdMk q44LLCqXNaye+6zyi9TWYX+JQkqe0fulf7B0Iy5eXBMHHF1OCVdl92etl3wEIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674894881; a=rsa-sha256; cv=none; b=Rtn6+vSxMuDwmpgK2M07RtbhykjTr1g4RQ91MHWXi+2DpKmEMJP+g/W9nVD5IiP24chWqN MQm1mMH655Q/yK3zuC/LB0U3svcI/V9NoNZgEsnOAxvSbqeju7SSaLInVZm8tueV2GWjUg QeHvIWOO0kCAXv6vBcpNrY561dxSt5pgOTLbUlIm1sdc9xmjSl2uIfzZRfx9QatnihJ9Gc AALYl4E1q3iqmCsqfwp0gSx89j/om1L+o3BtdkTR5nvrEOUxW4/ndufnTBM4lngY0zO3sW CMG5wagT6n52LkKVR9F7bykzskmC8DBjedNRgeWq6EK+GMZfzZg9cIeQ0HYasw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P3nmx2jB0zj9F; Sat, 28 Jan 2023 08:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30S8Yfci052262; Sat, 28 Jan 2023 08:34:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30S8YfYU052261; Sat, 28 Jan 2023 08:34:41 GMT (envelope-from git) Date: Sat, 28 Jan 2023 08:34:41 GMT Message-Id: <202301280834.30S8YfYU052261@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 69cd330861e1 - main - =?utf-8?Q?misc/librepo:=20Update=201.14.4=20=E2=86=92=201.15.1?= List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69cd330861e1ff1792d4783fed9613b7b19f22ef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=69cd330861e1ff1792d4783fed9613b7b19f22ef commit 69cd330861e1ff1792d4783fed9613b7b19f22ef Author: Yuri Victorovich AuthorDate: 2023-01-28 08:34:29 +0000 Commit: Yuri Victorovich CommitDate: 2023-01-28 08:34:29 +0000 misc/librepo: Update 1.14.4 → 1.15.1 Reported by: portscout --- misc/librepo/Makefile | 14 ++++++++++++-- misc/librepo/distinfo | 6 +++--- misc/librepo/files/patch-CMakeLists.txt | 4 ++-- misc/librepo/files/patch-librepo_CMakeLists.txt | 16 +++++++++++++--- misc/librepo/files/patch-tests_CMakeLists.txt | 10 ++++++++++ misc/librepo/files/xattr.c | 20 ++++++++++++++++++++ 6 files changed, 60 insertions(+), 10 deletions(-) diff --git a/misc/librepo/Makefile b/misc/librepo/Makefile index c20e616e2f43..5cc5e2750109 100644 --- a/misc/librepo/Makefile +++ b/misc/librepo/Makefile @@ -1,5 +1,5 @@ PORTNAME= librepo -DISTVERSION= 1.14.4 +DISTVERSION= 1.15.1 CATEGORIES= misc MAINTAINER= yuri@FreeBSD.org @@ -13,8 +13,12 @@ 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 localbase:ldflags pkgconfig +USES= cpe gettext-runtime gnome cmake:testing localbase:ldflags pkgconfig python shebangfix ssl CPE_VENDOR= redhat USE_GNOME= glib20 libxml2 USE_LDCONFIG= yes @@ -22,7 +26,13 @@ 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_OFF= ENABLE_DOCS ENABLE_TESTS +CMAKE_TESTING_ON= ENABLE_TESTS OPTIONS_DEFINE= PYTHON ZCHUNK OPTIONS_DEFAULT= ZCHUNK diff --git a/misc/librepo/distinfo b/misc/librepo/distinfo index a2f9f65f4258..e7fa9306a872 100644 --- a/misc/librepo/distinfo +++ b/misc/librepo/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1662272707 -SHA256 (rpm-software-management-librepo-1.14.4_GH0.tar.gz) = a945e4970ec1fc433b082841c609627de67ba61d00cd297ad827bbd3eccb75ee -SIZE (rpm-software-management-librepo-1.14.4_GH0.tar.gz) = 824325 +TIMESTAMP = 1674889454 +SHA256 (rpm-software-management-librepo-1.15.1_GH0.tar.gz) = 4af9edb3219030d35f4972ce520444f7534bd9c94729456ec0aea76e868a103a +SIZE (rpm-software-management-librepo-1.15.1_GH0.tar.gz) = 828520 diff --git a/misc/librepo/files/patch-CMakeLists.txt b/misc/librepo/files/patch-CMakeLists.txt index ca9ddc03cc8b..e722a9b880af 100644 --- a/misc/librepo/files/patch-CMakeLists.txt +++ b/misc/librepo/files/patch-CMakeLists.txt @@ -1,9 +1,9 @@ ---- CMakeLists.txt.orig 2022-08-19 07:04:41 UTC +--- CMakeLists.txt.orig 2022-12-09 12:47:26 UTC +++ CMakeLists.txt @@ -29,7 +29,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SO FIND_PACKAGE(PkgConfig) - PKG_CHECK_MODULES(GLIB2 glib-2.0>=2.28 REQUIRED) + PKG_CHECK_MODULES(GLIB2 glib-2.0>=2.28 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) diff --git a/misc/librepo/files/patch-librepo_CMakeLists.txt b/misc/librepo/files/patch-librepo_CMakeLists.txt index d74cffee9c49..b6d57f76719f 100644 --- a/misc/librepo/files/patch-librepo_CMakeLists.txt +++ b/misc/librepo/files/patch-librepo_CMakeLists.txt @@ -1,4 +1,4 @@ ---- librepo/CMakeLists.txt.orig 2020-08-22 20:15:59 UTC +--- librepo/CMakeLists.txt.orig 2022-12-09 12:47:26 UTC +++ librepo/CMakeLists.txt @@ -18,7 +18,8 @@ SET (librepo_SRCS url_substitution.c @@ -10,10 +10,20 @@ SET(librepo_HEADERS checksum.h -@@ -73,4 +74,6 @@ INSTALL(TARGETS librepo LIBRARY DESTINATION ${CMAKE_IN +@@ -52,6 +53,7 @@ TARGET_LINK_LIBRARIES(librepo + ${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 INSTALL(FILES "${CMAKE_BINARY_DIR}/librepo.pc" DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") +if (ENABLE_PYTHON) - ADD_SUBDIRECTORY(python) + IF (ENABLE_PYTHON) +endif() + ADD_SUBDIRECTORY(python) + ENDIF (ENABLE_PYTHON) diff --git a/misc/librepo/files/patch-tests_CMakeLists.txt b/misc/librepo/files/patch-tests_CMakeLists.txt new file mode 100644 index 000000000000..9ce6592f68e3 --- /dev/null +++ b/misc/librepo/files/patch-tests_CMakeLists.txt @@ -0,0 +1,10 @@ +--- tests/CMakeLists.txt.orig 2023-01-28 07:22:09 UTC ++++ tests/CMakeLists.txt +@@ -16,6 +16,7 @@ SET (librepotest_SRCS + test_url_substitution.c + test_util.c + test_version.c ++ ../librepo/xattr.c + ) + + #ADD_LIBRARY(testsys STATIC testsys.c) diff --git a/misc/librepo/files/xattr.c b/misc/librepo/files/xattr.c index 34ae5fce5ef6..c69d017fbd25 100644 --- a/misc/librepo/files/xattr.c +++ b/misc/librepo/files/xattr.c @@ -3,6 +3,7 @@ #include #include +#include /// /// xattr is a Linux kernel API that has to be mapped to the FreeBSD API @@ -20,6 +21,25 @@ static void convert_bsd_list(char *namebuf, size_t size) { } } +ssize_t getxattr(const char *path, const char *name, + void *value, ssize_t size, u_int32_t position, + int options) +{ +// if (position != 0 || +// !(options == 0 || options == XATTR_XATTR_NOFOLLOW)) { +// return -1; +// } + +// if (options & XATTR_XATTR_NOFOLLOW) { +// return extattr_get_link(path, EXTATTR_NAMESPACE_USER, +// name, value, size); +// } +// else { + return extattr_get_file(path, EXTATTR_NAMESPACE_USER, + name, value, size); +// } +} + int fsetxattr(int fd, const char *name, const void *value, size_t size, int flags) { int rv = 0;