From nobody Thu Nov 07 16:25:36 2024 X-Original-To: dev-commits-ports-main@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 4XknVm4r38z5c5gX; Thu, 07 Nov 2024 16:25:36 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XknVm3zMMz4HD9; Thu, 7 Nov 2024 16:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730996736; 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=cfBVC9fgfxQkspbe+EZmYZ63yuy+0+NY9FzKR8QE07U=; b=T7YZzWSDLMsncCaM63PXu8TBYE92ckNl30SByIK1GyoVDXhNrrReKsrJXdoNoCz0idLsXY 1Vsmk4rm2aoHsfVmPD/K75bjTaPa9sAuzR6MbGQb91ofWg/p3ntK1KcvgBZfy9dK68qW1w OXjmUPzK2oEm6XJQznxOfrUdOBy/6W9/Yb94QLdZE3y0l7r25SXTWAlxdpMpGvwVl9JWLA Gk1ySK1DeCwj93rJn0KZ4pjWI/35VSa5XXjrFEO6erd8F4hEnw7KjbqKm0Z7hetFQCVmhW uffO6GGFPy4Yq1lh9sWiC2+bwnwxlHYnOmXEKYXKTrAL9SpyOMAHHDxOpFQkFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730996736; 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=cfBVC9fgfxQkspbe+EZmYZ63yuy+0+NY9FzKR8QE07U=; b=jQ7+QyfB8yvio1hzan1ZLLkGO/ddU9zQvvItpS3XmUAVSTWX/HFofpDt0D0TE9fW1sLM6K k/DQUM/6ZLs0DKsDH+OB5MfTg0h3/3RAQr9+nPIZ6EFFOxq0bT467WBB609v23Tp9VA+Je l3ZMz1HDcyEv74xulRQccbksrVlPstmMbzDeTTsmwAG423gXUT+jSh1wS4pLi4NMxZp4Pa 1V3R95m29knKYWuLFWp7wYGKotjV5wxqluogwFLeoUHNitRIl0eGjeXDzIMgoYGhIxLc7Q CTL32F/BYULCbaEQMbYJBA2PsFIf+cydjimUBqF9u31ZHceW6cfzYjoLFnkYLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730996736; a=rsa-sha256; cv=none; b=xnshKso3Gx6/lC03Z3iLeNEV762h8Ag7segaLIKb/Bdw9yhTCeXu8u+wg0ylhjfWZl1EbL Qff/gi53fA6x1F2igagTgj2G79sKyVtiJXEvBkvYF55RFqd640xBuTAbVuSgkzaTvjXPWV THAhK4g1JTHLmv+SWPsq0SK/Vv34nEl+zQuSSCM/uB6nUILmkukhJ6+MuOGCEH2KQguWF2 grsOXLiUlYF00xur0XFpKPoEKFegViLL5oZUzviyCxCPzSptvUeVI25SD83rlsSVbuSG89 r5u39Sg9b07rtGIPrK747UJXdkwx7nmGr/YEO3UeMJwq1rSfj/Cz1dUJYh9aLA== 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 4XknVm3KJczst1; Thu, 7 Nov 2024 16:25:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4A7GPa7t054167; Thu, 7 Nov 2024 16:25:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4A7GPaf8054164; Thu, 7 Nov 2024 16:25:36 GMT (envelope-from git) Date: Thu, 7 Nov 2024 16:25:36 GMT Message-Id: <202411071625.4A7GPaf8054164@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: e72515028ca9 - main - devel/rubygem-rugged: use bundled ligbit2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e72515028ca9a44595cc728401c341e4858699de Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=e72515028ca9a44595cc728401c341e4858699de commit e72515028ca9a44595cc728401c341e4858699de Author: Nuno Teixeira AuthorDate: 2024-11-07 16:23:01 +0000 Commit: Matthias Fechner CommitDate: 2024-11-07 16:25:16 +0000 devel/rubygem-rugged: use bundled ligbit2 the current libgit2 (1.8.x) is not compatible with rugged and is causing problem with ssh support. PR: 282593 Reported by: einar@isnic.is --- devel/rubygem-rugged/Makefile | 19 +++++++---- .../files/patch-ext_rugged_extconf.rb | 37 ---------------------- 2 files changed, 13 insertions(+), 43 deletions(-) diff --git a/devel/rubygem-rugged/Makefile b/devel/rubygem-rugged/Makefile index 82cd322f211b..f4759eef2697 100644 --- a/devel/rubygem-rugged/Makefile +++ b/devel/rubygem-rugged/Makefile @@ -2,7 +2,7 @@ PORTNAME= rugged PORTVERSION= 1.7.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -13,11 +13,18 @@ WWW= https://github.com/libgit2/rugged LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= libgit2>=${PORTVERSION:R}:devel/libgit2 -LIB_DEPENDS= libgit2.so:devel/libgit2 \ - libgmp.so:math/gmp +# switch to bundled libgit2 version as rugged does not support 1.8 version from ports (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282593) +#BUILD_DEPENDS= libgit2>=${PORTVERSION:R}:devel/libgit2 +#LIB_DEPENDS= libgit2.so:devel/libgit2 \ +# libgmp.so:math/gmp +#CONFIGURE_ARGS= --use-system-libraries +#USES= gem pkgconfig +LIB_DEPENDS= libssh2.so:security/libssh2 -CONFIGURE_ARGS= --use-system-libraries -USES= gem pkgconfig +CONFIGURE_ARGS= --with-ssh +USES= cmake:indirect gem pkgconfig ssl + +post-install: + ${RM} -r ${STAGEDIR}${PREFIX}/${GEM_LIB_DIR}/vendor/libgit2/build .include diff --git a/devel/rubygem-rugged/files/patch-ext_rugged_extconf.rb b/devel/rubygem-rugged/files/patch-ext_rugged_extconf.rb deleted file mode 100644 index 41fd2d2aed76..000000000000 --- a/devel/rubygem-rugged/files/patch-ext_rugged_extconf.rb +++ /dev/null @@ -1,37 +0,0 @@ -# Remove broken libgit2 detection - ---- ext/rugged/extconf.rb.orig 2024-10-19 10:29:11 UTC -+++ ext/rugged/extconf.rb -@@ -65,32 +65,6 @@ if arg_config("--use-system-libraries", !!ENV['RUGGED_ - - if arg_config("--use-system-libraries", !!ENV['RUGGED_USE_SYSTEM_LIBRARIES']) - puts "Building Rugged using system libraries.\n" -- -- dir_config('git2').any? or pkg_config('libgit2') -- -- major = minor = nil -- -- File.readlines(File.join(LIBGIT2_DIR, "include", "git2", "version.h")).each do |line| -- if !major && (matches = line.match(/^#define LIBGIT2_VER_MAJOR\s+([0-9]+)$/)) -- major = matches[1] -- next -- end -- -- if !minor && (matches = line.match(/^#define LIBGIT2_VER_MINOR\s+([0-9]+)$/)) -- minor = matches[1] -- next -- end -- -- break if major && minor -- end -- -- try_compile(<<-SRC) or abort "libgit2 version is not compatible, expected ~> #{major}.#{minor}.0" --#include -- --#if LIBGIT2_VER_MAJOR != #{major} || LIBGIT2_VER_MINOR != #{minor} --#error libgit2 version is not compatible --#endif -- SRC - else - if !find_executable('cmake') - abort "ERROR: CMake is required to build Rugged."