diff --git a/devel/libgit2/Makefile b/devel/libgit2/Makefile index 9515b3a28daa..89f47924c907 100644 --- a/devel/libgit2/Makefile +++ b/devel/libgit2/Makefile @@ -1,53 +1,53 @@ # Also update devel/libgit2-glib, devel/rubygem-rugged, devel/py-pygit2 # Make sure you bump revision of depending ports, if SONAME changes # objdump -p libgit2.so |grep SONAME # Tools/scripts/search_lib_depends_and_bump.sh devel/libgit2 PORTNAME= libgit2 DISTVERSIONPREFIX= v -DISTVERSION= 1.3.2 +DISTVERSION= 1.5.0 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org COMMENT= Portable, pure C implementation of the Git core WWW= https://libgit2.github.com/ LICENSE= GPLv2 LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \ libhttp_parser.so:www/http-parser USES= cmake cpe pkgconfig ssl USE_GITHUB= yes USE_LDCONFIG= yes CMAKE_ARGS= -DREGEX_BACKEND=pcre2 -DUSE_HTTP_PARSER=system CMAKE_OFF= BUILD_CLAR PLIST_SUB= DISTVERSION=${DISTVERSION} \ SHLIB_VER=${DISTVERSION:R} OPTIONS_DEFINE= SSH THREADS OPTIONS_DEFAULT=SSH THREADS SSH_DESC= Enable SSH support through libssh2 SSH_LIB_DEPENDS= libssh2.so:security/libssh2 SSH_CMAKE_BOOL= USE_SSH THREADS_CMAKE_BOOL= THREADSAFE .include .if ${SSL_DEFAULT} == base post-patch: @${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \ ${WRKSRC}/cmake/SelectHTTPSBackend.cmake .endif do-test: @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \ -DBUILD_CLAR=ON ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ ${SETENV} ${MAKE_ENV} CTEST_OUTPUT_ON_FAILURE=1 ${MAKE_CMD} ${MAKE_ARGS} test .include diff --git a/devel/libgit2/distinfo b/devel/libgit2/distinfo index 9e0e5ff0cdf9..e84ab241d109 100644 --- a/devel/libgit2/distinfo +++ b/devel/libgit2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1657692035 -SHA256 (libgit2-libgit2-v1.3.2_GH0.tar.gz) = 3a4469b32b73d53f9dbb7bf17b61b0cfb7dae9020e199f928fa96f12d6eb29cb -SIZE (libgit2-libgit2-v1.3.2_GH0.tar.gz) = 5824473 +TIMESTAMP = 1668845752 +SHA256 (libgit2-libgit2-v1.5.0_GH0.tar.gz) = 8de872a0f201b33d9522b817c92e14edb4efad18dae95cf156cf240b2efff93e +SIZE (libgit2-libgit2-v1.5.0_GH0.tar.gz) = 5893437 diff --git a/devel/libgit2/files/patch-tests_network_url_parse.c b/devel/libgit2/files/patch-tests_network_url_parse.c deleted file mode 100644 index d466cb1ce18f..000000000000 --- a/devel/libgit2/files/patch-tests_network_url_parse.c +++ /dev/null @@ -1,116 +0,0 @@ ---- tests/network/url/parse.c.orig 2021-09-27 20:09:50 UTC -+++ tests/network/url/parse.c -@@ -63,18 +63,6 @@ void test_network_url_parse__hostname_implied_root_cus - cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); - } - --void test_network_url_parse__hostname_implied_root_empty_port(void) --{ -- cl_git_pass(git_net_url_parse(&conndata, "http://example.com:")); -- cl_assert_equal_s(conndata.scheme, "http"); -- cl_assert_equal_s(conndata.host, "example.com"); -- cl_assert_equal_s(conndata.port, "80"); -- cl_assert_equal_s(conndata.path, "/"); -- cl_assert_equal_p(conndata.username, NULL); -- cl_assert_equal_p(conndata.password, NULL); -- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); --} -- - void test_network_url_parse__hostname_encoded_password(void) - { - cl_git_pass(git_net_url_parse(&conndata, -@@ -129,18 +117,6 @@ void test_network_url_parse__hostname_port(void) - cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); - } - --void test_network_url_parse__hostname_empty_port(void) --{ -- cl_git_pass(git_net_url_parse(&conndata, "http://example.com:/resource")); -- cl_assert_equal_s(conndata.scheme, "http"); -- cl_assert_equal_s(conndata.host, "example.com"); -- cl_assert_equal_s(conndata.port, "80"); -- cl_assert_equal_s(conndata.path, "/resource"); -- cl_assert_equal_p(conndata.username, NULL); -- cl_assert_equal_p(conndata.password, NULL); -- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); --} -- - void test_network_url_parse__hostname_user_port(void) - { - /* user@hostname.tld:port/resource */ -@@ -219,18 +195,6 @@ void test_network_url_parse__ipv4_implied_root_custom_ - cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); - } - --void test_network_url_parse__ipv4_implied_root_empty_port(void) --{ -- cl_git_pass(git_net_url_parse(&conndata, "http://192.168.1.1:")); -- cl_assert_equal_s(conndata.scheme, "http"); -- cl_assert_equal_s(conndata.host, "192.168.1.1"); -- cl_assert_equal_s(conndata.port, "80"); -- cl_assert_equal_s(conndata.path, "/"); -- cl_assert_equal_p(conndata.username, NULL); -- cl_assert_equal_p(conndata.password, NULL); -- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); --} -- - void test_network_url_parse__ipv4_encoded_password(void) - { - cl_git_pass(git_net_url_parse(&conndata, -@@ -283,18 +247,6 @@ void test_network_url_parse__ipv4_port(void) - cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); - } - --void test_network_url_parse__ipv4_empty_port(void) --{ -- cl_git_pass(git_net_url_parse(&conndata, "http://192.168.1.1:/resource")); -- cl_assert_equal_s(conndata.scheme, "http"); -- cl_assert_equal_s(conndata.host, "192.168.1.1"); -- cl_assert_equal_s(conndata.port, "80"); -- cl_assert_equal_s(conndata.path, "/resource"); -- cl_assert_equal_p(conndata.username, NULL); -- cl_assert_equal_p(conndata.password, NULL); -- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); --} -- - void test_network_url_parse__ipv4_user_port(void) - { - cl_git_pass(git_net_url_parse(&conndata, -@@ -371,18 +323,6 @@ void test_network_url_parse__ipv6_implied_root_custom_ - cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); - } - --void test_network_url_parse__ipv6_implied_root_empty_port(void) --{ -- cl_git_pass(git_net_url_parse(&conndata, "http://[fe80::dcad:beff:fe00:0001]:")); -- cl_assert_equal_s(conndata.scheme, "http"); -- cl_assert_equal_s(conndata.host, "fe80::dcad:beff:fe00:0001"); -- cl_assert_equal_s(conndata.port, "80"); -- cl_assert_equal_s(conndata.path, "/"); -- cl_assert_equal_p(conndata.username, NULL); -- cl_assert_equal_p(conndata.password, NULL); -- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); --} -- - void test_network_url_parse__ipv6_encoded_password(void) - { - cl_git_pass(git_net_url_parse(&conndata, -@@ -433,18 +373,6 @@ void test_network_url_parse__ipv6_port(void) - cl_assert_equal_p(conndata.username, NULL); - cl_assert_equal_p(conndata.password, NULL); - cl_assert_equal_i(git_net_url_is_default_port(&conndata), 0); --} -- --void test_network_url_parse__ipv6_empty_port(void) --{ -- cl_git_pass(git_net_url_parse(&conndata, "http://[fe80::dcad:beff:fe00:0001]:/resource")); -- cl_assert_equal_s(conndata.scheme, "http"); -- cl_assert_equal_s(conndata.host, "fe80::dcad:beff:fe00:0001"); -- cl_assert_equal_s(conndata.port, "80"); -- cl_assert_equal_s(conndata.path, "/resource"); -- cl_assert_equal_p(conndata.username, NULL); -- cl_assert_equal_p(conndata.password, NULL); -- cl_assert_equal_i(git_net_url_is_default_port(&conndata), 1); - } - - void test_network_url_parse__ipv6_user_port(void) diff --git a/devel/libgit2/pkg-plist b/devel/libgit2/pkg-plist index a1b85dce32c1..5d774ab0854c 100644 --- a/devel/libgit2/pkg-plist +++ b/devel/libgit2/pkg-plist @@ -1,95 +1,97 @@ +bin/git2_cli include/git2.h include/git2/annotated_commit.h include/git2/apply.h include/git2/attr.h include/git2/blame.h include/git2/blob.h include/git2/branch.h include/git2/buffer.h include/git2/cert.h include/git2/checkout.h include/git2/cherrypick.h include/git2/clone.h include/git2/commit.h include/git2/common.h include/git2/config.h include/git2/cred_helpers.h include/git2/credential.h include/git2/credential_helpers.h include/git2/deprecated.h include/git2/describe.h include/git2/diff.h include/git2/email.h include/git2/errors.h include/git2/filter.h include/git2/global.h include/git2/graph.h include/git2/ignore.h include/git2/index.h include/git2/indexer.h include/git2/mailmap.h include/git2/merge.h include/git2/message.h include/git2/net.h include/git2/notes.h include/git2/object.h include/git2/odb.h include/git2/odb_backend.h include/git2/oid.h include/git2/oidarray.h include/git2/pack.h include/git2/patch.h include/git2/pathspec.h include/git2/proxy.h include/git2/rebase.h include/git2/refdb.h include/git2/reflog.h include/git2/refs.h include/git2/refspec.h include/git2/remote.h include/git2/repository.h include/git2/reset.h include/git2/revert.h include/git2/revparse.h include/git2/revwalk.h include/git2/signature.h include/git2/stash.h include/git2/status.h include/git2/stdint.h include/git2/strarray.h include/git2/submodule.h include/git2/sys/alloc.h include/git2/sys/commit.h include/git2/sys/commit_graph.h include/git2/sys/config.h include/git2/sys/cred.h include/git2/sys/credential.h include/git2/sys/diff.h include/git2/sys/email.h include/git2/sys/filter.h include/git2/sys/hashsig.h include/git2/sys/index.h include/git2/sys/mempack.h include/git2/sys/merge.h include/git2/sys/midx.h include/git2/sys/odb_backend.h include/git2/sys/openssl.h include/git2/sys/path.h include/git2/sys/refdb_backend.h include/git2/sys/reflog.h +include/git2/sys/remote.h include/git2/sys/refs.h include/git2/sys/repository.h include/git2/sys/stream.h include/git2/sys/transport.h include/git2/tag.h include/git2/trace.h include/git2/transaction.h include/git2/transport.h include/git2/tree.h include/git2/types.h include/git2/version.h include/git2/worktree.h lib/libgit2.so lib/libgit2.so.%%DISTVERSION%% lib/libgit2.so.%%SHLIB_VER%% libdata/pkgconfig/libgit2.pc