From nobody Tue Nov 26 21:11:03 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 4XyZxM5T5pz5f1vC; Tue, 26 Nov 2024 21:11:03 +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 4XyZxM4vM7z489G; Tue, 26 Nov 2024 21:11:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732655463; 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=+Nnfv6FIdpsqVf7BTIgxnfkq1wpG24AT5+n4Uess5E8=; b=vt5w1fN18jP/4cycsSRsmF8l7EmRMtgMIN4QwELQgqanapDoAf0wJbE9pa6uhckiPGKRE1 rY95TuvzMXmNZNSY0pjp7SeIxXTXRijWw2cgSBCpbdJm5lGerRc2aoelmlvzse51aR125Z L4Sp2YlXG8gWn9jIRA2xgz2tzl+lkqLzQ+kYtw+5j3jaQxmxqvU6+jVH3yi//2SyMHVp+S hK1/BEmt+kQ6ZYFBpaIY+UKExngxLgdw+6Pv9KK5b3T9jrNbjo+gjwqpdMy4ACWRU1ATc8 EM3/LT9bz3I11Ctc/SKCUeJx6LR2myYJzxtRJ50wD/v+CbX0GWqxb0zUZGEGUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732655463; 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=+Nnfv6FIdpsqVf7BTIgxnfkq1wpG24AT5+n4Uess5E8=; b=X8HWLlKAgRj3qh+F3jBN2q/gwUxpwr6jUvSFtsLkaOS/BjCjhF46aEH6RqqHh+pjk4Cf8x MHVbjbqz7h20PA/dp5RYNum4x4h/cIvnvWhxqQjDfo1PMmpMUqSof04jZjSy5Y+RXF2uj+ 7aoOXA4QnWKOcapZZybtxa9r0fPw3CRhKuIPhqslgVfR5dn4BMMM1QE+RATfiNwCboKl6a YcXgnVAcRuUFfoGKlxZr+pl2uN9JowA9Z1w3bgqQNyZWPYP9Mzm2SaOjzX7v0Pfkw8cs+m dT23JVMKCADjc4f4toA1j2x7OzxLIToYS5lUFVwUn5vnFTNERtzw2G9sazzNww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732655463; a=rsa-sha256; cv=none; b=EIqCIQDWuY1nA7hiXOV22H1TdFtWZ5OS3PTytQnsYB9AqQ+PEkhMOZ+KFUxnrwejQ9loN+ 5H2bqQEC5t+DUtSJ6zJYw/4Xyk/hooNb6AuvDfFinggWs0lIEoVDqEcHEtkdMe1bF5lAF2 vK37/l245GEqQ41RK4ru4uTsR6NWYpe8mtGczUOe8SDyLI7v6ggBz2ftlZaKBnt6l+/ukJ UG6rywoarfUXP+6NZ7kjHDQIA8VUaKE+fYwvcRCQ3haZba8yAp/o1LHE430IsR0+eNlL6s gSaBOQef4cIxtzcV2Y/6eNm9WSd7gok07vW+xNta2pONPSMX8PV9BMHHr1W/oA== 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 4XyZxM4VLfzhGT; Tue, 26 Nov 2024 21:11:03 +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 4AQLB3NH004848; Tue, 26 Nov 2024 21:11:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AQLB3ve004833; Tue, 26 Nov 2024 21:11:03 GMT (envelope-from git) Date: Tue, 26 Nov 2024 21:11:03 GMT Message-Id: <202411262111.4AQLB3ve004833@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Santhosh Raju Subject: git: b395ce142c17 - main - www/opengist: Update to 1.8.2 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: fox X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b395ce142c1708c92a24d0c0c5749a9ff83191ee Auto-Submitted: auto-generated The branch main has been updated by fox: URL: https://cgit.FreeBSD.org/ports/commit/?id=b395ce142c1708c92a24d0c0c5749a9ff83191ee commit b395ce142c1708c92a24d0c0c5749a9ff83191ee Author: Santhosh Raju AuthorDate: 2024-11-26 10:00:22 +0000 Commit: Santhosh Raju CommitDate: 2024-11-26 21:10:35 +0000 www/opengist: Update to 1.8.2 Update the default location of the DB. Changes since 1.8.1: v1.8.2 Added * More translation strings (#373) (#388) Changed * Enforce git config on startup (#383) * Respect file scheme URIs for SQLite. (#387) Fixed * Convert octal notation file names in Git (#380) * Git clone on SSH with MySQL (#382) * Escaping for embed gists (#381) Other * Update deps Golang & JS deps --- www/opengist/Makefile | 7 ++++++- www/opengist/distinfo | 14 +++++++------- www/opengist/files/patch-internal_cli_main.go | 19 +++++++++++++++++++ www/opengist/pkg-plist | 1 + 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/www/opengist/Makefile b/www/opengist/Makefile index 0df11a53817d..cac6e4f7bfda 100644 --- a/www/opengist/Makefile +++ b/www/opengist/Makefile @@ -1,5 +1,5 @@ PORTNAME= opengist -PORTVERSION= 1.8.1 +PORTVERSION= 1.8.2 DISTVERSIONPREFIX= v CATEGORIES= www textproc MASTER_SITES= LOCAL/fox/:js @@ -32,6 +32,10 @@ GO_BUILDFLAGS= -tags fs_embed \ post-extract: @${RLN} ${WRKDIR}/node_modules ${WRKSRC}/node_modules +post-patch: + @${REINPLACE_CMD} -e 's|opengist.db|file:/var/db/${PORTNAME}/opengist.db|g' \ + ${WRKSRC}/config.yml + pre-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} npx --offline vite -c public/vite.config.js build cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ @@ -40,6 +44,7 @@ pre-build: post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/config.yml ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/config.yml.sample + ${MKDIR} ${STAGEDIR}/var/db/${PORTNAME} ${MKDIR} ${STAGEDIR}/var/run/${PORTNAME} ${MKDIR} ${STAGEDIR}${WWWDIR}/assets cd ${WRKSRC} && ${INSTALL_DATA} public/assets/* ${STAGEDIR}${WWWDIR}/assets diff --git a/www/opengist/distinfo b/www/opengist/distinfo index 57e46617b694..081c350d163a 100644 --- a/www/opengist/distinfo +++ b/www/opengist/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1731775790 -SHA256 (go/www_opengist/opengist-v1.8.1/opengist-1.8.1-node_modules.tgz) = e42cb24f3fe6c12cfdad2de2ac3ad829108cdcb99a988197177c924b65b8a885 -SIZE (go/www_opengist/opengist-v1.8.1/opengist-1.8.1-node_modules.tgz) = 22842430 -SHA256 (go/www_opengist/opengist-v1.8.1/v1.8.1.mod) = 5d7a604b4ac7fd4d6e52fcc87e825b75f6c8b7c5ea531111437e74304b9edc36 -SIZE (go/www_opengist/opengist-v1.8.1/v1.8.1.mod) = 5058 -SHA256 (go/www_opengist/opengist-v1.8.1/v1.8.1.zip) = f097bab3a178016af715e73f2e5008c4e89b9806456022141573ce19c454f7d8 -SIZE (go/www_opengist/opengist-v1.8.1/v1.8.1.zip) = 1610649 +TIMESTAMP = 1732608998 +SHA256 (go/www_opengist/opengist-v1.8.2/opengist-1.8.2-node_modules.tgz) = deb15e3a5500053f4eadba6ab5b2f4278d63f8d6f55bd6977442aa0ef0653a92 +SIZE (go/www_opengist/opengist-v1.8.2/opengist-1.8.2-node_modules.tgz) = 22839740 +SHA256 (go/www_opengist/opengist-v1.8.2/v1.8.2.mod) = e23e2417d8d5b9b0cfee169732e45679fe2cda94d3153c9edb51cc56ce7343ec +SIZE (go/www_opengist/opengist-v1.8.2/v1.8.2.mod) = 5060 +SHA256 (go/www_opengist/opengist-v1.8.2/v1.8.2.zip) = e62fc065354f96b04e3c98c8c195fe57e79bfdd2f5fff90a13995e2431dc14cc +SIZE (go/www_opengist/opengist-v1.8.2/v1.8.2.zip) = 1618924 diff --git a/www/opengist/files/patch-internal_cli_main.go b/www/opengist/files/patch-internal_cli_main.go new file mode 100644 index 000000000000..18226beeca97 --- /dev/null +++ b/www/opengist/files/patch-internal_cli_main.go @@ -0,0 +1,19 @@ +--- internal/cli/main.go.orig 1979-11-30 00:00:00 UTC ++++ internal/cli/main.go +@@ -92,12 +92,12 @@ func Initialize(ctx *cli.Context) { + "Current git version: " + gitVersion) + } + +- if err := git.InitGitConfig(); err != nil { +- log.Fatal().Err(err).Send() +- } +- + homePath := config.GetHomeDir() + log.Info().Msg("Data directory: " + homePath) ++ ++ if err := git.InitGitConfig(); err != nil { ++ log.Warn().Msg("Git config modification failed, ensure " + homePath + " is added to git safe directories, and receive.advertisePushOptions is set to true.") ++ } + + if err := createSymlink(homePath, ctx.String("config")); err != nil { + log.Fatal().Err(err).Msg("Failed to create symlinks") diff --git a/www/opengist/pkg-plist b/www/opengist/pkg-plist index 10b82af0fa2b..a5bbab4c2094 100644 --- a/www/opengist/pkg-plist +++ b/www/opengist/pkg-plist @@ -13,4 +13,5 @@ etc/rc.d/opengist %%WWWDIR%%/assets/opengist-85b89b9c.svg %%WWWDIR%%/assets/webauthn-da047c6d.js %%WWWDIR%%/manifest.json +@dir /var/db/opengist @dir /var/run/opengist