From nobody Fri Nov 15 15:57:54 2024 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 4XqhW75cYVz5dJDX; Fri, 15 Nov 2024 15:57:55 +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 4XqhW71ZTQz4CYh; Fri, 15 Nov 2024 15:57:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731686275; 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=ukdx4pMIt7qLMHKrPpevEelsGOpkxbGDmdbohSZUuLI=; b=vAna9r+N0IcN9AI1VGPtopW8oNKZUwNvDGP3CSphqcXsJPOAL6eE/LU9YKL8+PV+G9hVhx +WcxiP8eKLfNyINxXlZDfp+uDeqt5Ee7UlgFIjw1CmSEbakuGHQ0i5Bskzk8EnKttK6I4Q 9yOesF3F88THCUD1OCEt7CL6AwyH7Bd7sPbLo/+psaJD4NNC+ytOGzIdzPhHURUhpvfOm+ L2KJGdw7J06KQy1+S77VIVmvef1o8D8ke95ymmGmewrNsRdKhL1v3znSbuOV8U2XB9VKJS f19GrvOK9vvnlQQCwFJEifBTPBARiGpT1ygrkEWx2xg+TpXPcia940BU4H66Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731686275; 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=ukdx4pMIt7qLMHKrPpevEelsGOpkxbGDmdbohSZUuLI=; b=weuwes2mlmSCuhfoHVX5vbwLJ3bbNShjwZI/Lui0rzDEedMbhSlfPvIFfA/qwaXdz/Lj0u RhK7ANdO8N/pzfNgW6XkV3OKwJsFCSy2lgSnGfClHCzku7Ck3J/AjKaNfAygSkRXcBgZBd R7YKCTUYkcWRQVp+QHNLENXAsuH5OiRJvBOwFVPYI6RDIkxH3J+UJeDv/qUJBeWyaiOHJc I6QNY8zeAb1Cdi8UDQcI+512sbtBela+3SAr8ijfWGfioNmZC+oX5YXc7Skoiv+a2OYMfa Itbpn+dcFtDAfEMHDSEAhtx4JBqEy9fUgn+xpG+VDRr1FTETle5IGYT2mGV4Aw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731686275; a=rsa-sha256; cv=none; b=Jdy+uvqkt0kZFcu7vx+ZbdGzcwMGJYng7ObYA4BPXijUSkIxB/yTSNctT6i1n8M8e6V0Rl nqR0LK4e//2tkCSRBarQRN1TQI5gKzpcsJaPAF4XB6aOcO8SWTCZmI23sa2zidQ2Q1SFBz hpUNHkJ6SFqdXl/j7lbJ0rZvEcSksuaHlj0N8Mx3QggpRtXsrQCgnAr1HJKtkOYX74j9ym 1zXu8+jyZjOSUVC2vxXmTAjhXbWaDu+5zG24ZOPe9qP8jcyCZwRLKNvVWV7m20BIGgz1b9 pG+37V3M3TOw+PouqTfUOOzBZ0SMoB+D10zl5C0PGMzo3Yci9TEmQnX5Fq0nGA== 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 4XqhW70mgxzV0r; Fri, 15 Nov 2024 15:57:55 +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 4AFFvsli094756; Fri, 15 Nov 2024 15:57:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AFFvsB2094753; Fri, 15 Nov 2024 15:57:54 GMT (envelope-from git) Date: Fri, 15 Nov 2024 15:57:54 GMT Message-Id: <202411151557.4AFFvsB2094753@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 8f668fba0d28 - 2024Q4 - devel/rubygem-rugged: use bundled ligbit2 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/2024Q4 X-Git-Reftype: branch X-Git-Commit: 8f668fba0d28f6faef186bfdc1e9d233c559e237 Auto-Submitted: auto-generated The branch 2024Q4 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=8f668fba0d28f6faef186bfdc1e9d233c559e237 commit 8f668fba0d28f6faef186bfdc1e9d233c559e237 Author: Nuno Teixeira AuthorDate: 2024-11-07 16:23:01 +0000 Commit: Matthias Fechner CommitDate: 2024-11-15 15:56:44 +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 (cherry picked from commit e72515028ca9a44595cc728401c341e4858699de) --- devel/rubygem-rugged/Makefile | 18 ++++++++--- .../files/patch-ext_rugged_extconf.rb | 37 ---------------------- 2 files changed, 13 insertions(+), 42 deletions(-) diff --git a/devel/rubygem-rugged/Makefile b/devel/rubygem-rugged/Makefile index a8f1fb655887..f4759eef2697 100644 --- a/devel/rubygem-rugged/Makefile +++ b/devel/rubygem-rugged/Makefile @@ -2,6 +2,7 @@ PORTNAME= rugged PORTVERSION= 1.7.2 +PORTREVISION= 3 CATEGORIES= devel rubygems MASTER_SITES= RG @@ -12,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."