From nobody Wed Jun 22 03:31:53 2022 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 0C3EF8746E4; Wed, 22 Jun 2022 03:31:54 +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 4LSTT55YxSz4rpg; Wed, 22 Jun 2022 03:31:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655868713; 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=1vTWvAPvsLzMu+17jzVZkKQyLoIuheMQ/XncUJgXMIQ=; b=kCP5Fa08PAFHn7GzsIUfRSqFFRQacS5/Pw3l4b7ce5A6OnD+0VinFY6aQL+/CzfBNc5rrf bYF9WALhtb41cXN59SkeIZJwGSXxzEA0P4AX+56A62WJNMZw9RU23cN1tS1BZv6KjNc1G1 eb8KjiS1XL7B4pNs9LiFEx6iXMpR3jmch4QbjUPwQlUiR9Wix6luVlXDzklDuBWyhaBwpj ukwsiPUKlVXyjYet6lfcb2aaM3uSyU3jHHs9np6vZAdHkk5pJr8YeXvrc6XxWYTFUwkxcR /ftjzfJqCmXO0dLz0GRj2eAPC8NiPlVsfE607VR2/HPoY27LJuQoKhgpHMv1sw== 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 587C01E7DF; Wed, 22 Jun 2022 03:31:53 +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 25M3Vrbj056985; Wed, 22 Jun 2022 03:31:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25M3Vr4E056984; Wed, 22 Jun 2022 03:31:53 GMT (envelope-from git) Date: Wed, 22 Jun 2022 03:31:53 GMT Message-Id: <202206220331.25M3Vr4E056984@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 2282a2c6c2de - main - net-im/gotosocial: Update to 0.3.6 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: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2282a2c6c2deab8954df7b8c58f649b5cc8b8876 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655868713; 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=1vTWvAPvsLzMu+17jzVZkKQyLoIuheMQ/XncUJgXMIQ=; b=XCKUQ9wGes/NkDGlJcXWBQjjO7G072hSJ3ohk+O8NNMyWVtpE+DTy5ID9c/jaX50IxL+pO 8v3UVndBJ1StrFkfeGMkPhXaCTBfymHXhX9K6T6xNJJ2Aio0+LDvH4oONq0Uoyw1RPnGGE 5vpP+l65xUa+91jZ44Om59n1gmMEIpCpA39XrET7arij1ZVQZXIztJNJvWGl0bqsoWDyna QN9S4klPlDzM4T5ggKTALcs8pEMNiMWoFktmMD84bQXSl6lQ7KTwuj2Gf4w/XMpaypY9E7 te64mXqsCV3uKtR4jOArTwOkWKN3Peio5v7/A4QuKFVy82I11UXBAWyom37CFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655868713; a=rsa-sha256; cv=none; b=dIaeG3hPPbtA3RyafKELN+bwbeaLQuAjxiZM3ZjMT7VKxSytQA88KOoZNB8YtFkEMiLUSj GcahzfVV8s8U5m2naPXYQ3+J+wvOuecE/TQWxxNiGnrkrmPuPsJvx4nLWKSoz/ThIQ3v8M 1uJ45RlCcaXD/SwD0eDTOOtWNwfx2krYG1yKxhVshKguunr5TS0iz8pd5g6qZYuaaCglcR E2fWSyenBwn/qXjskCqWE0BJR5Rb0ddCcIjEpEAgjGU2a/ozIJ1jQfGlrhpgXABPlbI6hX r3Z6P2Hri2SIzvEZDt1XSDdo4Yh/RRGnBs3/CHMzTTaih0vT4Ca0FtZzKDmzSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=2282a2c6c2deab8954df7b8c58f649b5cc8b8876 commit 2282a2c6c2deab8954df7b8c58f649b5cc8b8876 Author: Mina Galić AuthorDate: 2022-06-22 03:30:20 +0000 Commit: Neel Chauhan CommitDate: 2022-06-22 03:30:20 +0000 net-im/gotosocial: Update to 0.3.6 PR: 264814 --- net-im/gotosocial/Makefile | 20 ++++++++++---------- net-im/gotosocial/distinfo | 8 +++++--- net-im/gotosocial/files/patch-example_config.yaml | 8 ++++---- net-im/gotosocial/pkg-plist | 15 +++++++++++---- 4 files changed, 30 insertions(+), 21 deletions(-) diff --git a/net-im/gotosocial/Makefile b/net-im/gotosocial/Makefile index 554deabaaa92..525b2c7b9305 100644 --- a/net-im/gotosocial/Makefile +++ b/net-im/gotosocial/Makefile @@ -1,8 +1,9 @@ PORTNAME= gotosocial DISTVERSIONPREFIX= v -DISTVERSION= 0.3.4 -PORTREVISION= 1 +DISTVERSION= 0.3.6 CATEGORIES= net-im +MASTER_SITES?= https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/v${DISTVERSION}/:web +DISTFILES?= ${PORTNAME}_${DISTVERSION}_web-assets.tar.gz:web MAINTAINER= me+freebsd@igalic.co COMMENT= Golang fediverse server @@ -15,20 +16,20 @@ ONLY_FOR_ARCHS= amd64 # Note: we don't use go:modules, because this project vendors all deps USES= go USE_RC_SUBR= ${PORTNAME} + USE_GITHUB= yes GH_ACCOUNT= superseriousbusiness -# When rebuilding yourself, please set this: -#GH_TAGNAME= f848aaa81f04666dae29e0bb85ccf31d30574de7 + +SUB_LIST= DBDIR="${DBDIR}" \ + GROUP="${GROUPS}" \ + USER="${USERS}" \ + WWWDIR="${WWWDIR}" USERS= gotosocial GROUPS= gotosocial DBDIR= /var/db/${PORTNAME} -SUB_LIST= DBDIR="${DBDIR}" \ - GROUP="${GROUPS}" \ - USER="${USERS}" \ - WWWDIR="${WWWDIR}" PLIST_SUB= WWWDIR="${WWWDIR}" # patch sample config for people who set a custom prefix @@ -53,7 +54,6 @@ do-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/example/config.yaml \ ${STAGEDIR}${ETCDIR}/config.yaml.sample - (cd ${WRKSRC}/web && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/ \ - "! ( -path */gotosocial-styling* )") + (cd ${WRKSRC}/../web && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/ ) .include diff --git a/net-im/gotosocial/distinfo b/net-im/gotosocial/distinfo index 6ab84459863c..ed35640df010 100644 --- a/net-im/gotosocial/distinfo +++ b/net-im/gotosocial/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1653574184 -SHA256 (superseriousbusiness-gotosocial-v0.3.4_GH0.tar.gz) = 2bc7baadd3e79d79e6628314ddfb4c6ef135729bf7488384e804f66d67e45961 -SIZE (superseriousbusiness-gotosocial-v0.3.4_GH0.tar.gz) = 48532595 +TIMESTAMP = 1655843939 +SHA256 (gotosocial_0.3.6_web-assets.tar.gz) = 58bf5761238848b136f06abb56425af03bae29922e2ceb6a9af25a9ce8eafb54 +SIZE (gotosocial_0.3.6_web-assets.tar.gz) = 998627 +SHA256 (superseriousbusiness-gotosocial-v0.3.6_GH0.tar.gz) = ade65d0cb7ecbd6a0e95d7fdd2d802638fbaa9b1bcedb79e10023ad29b652e73 +SIZE (superseriousbusiness-gotosocial-v0.3.6_GH0.tar.gz) = 48824501 diff --git a/net-im/gotosocial/files/patch-example_config.yaml b/net-im/gotosocial/files/patch-example_config.yaml index c82827ad9d16..beead207f516 100644 --- a/net-im/gotosocial/files/patch-example_config.yaml +++ b/net-im/gotosocial/files/patch-example_config.yaml @@ -1,6 +1,6 @@ ---- example/config.yaml.orig 2022-02-03 11:30:06 UTC +--- example/config.yaml.orig 2022-06-20 12:11:36 UTC +++ example/config.yaml -@@ -151,12 +151,12 @@ db-tls-ca-cert: "" +@@ -158,12 +158,12 @@ db-tls-ca-cert: "" # String. Directory from which gotosocial will attempt to load html templates (.tmpl files). # Examples: ["/some/absolute/path/", "./relative/path/", "../../some/weird/path/"] # Default: "./web/template/" @@ -15,7 +15,7 @@ ########################### ##### ACCOUNTS CONFIG ##### -@@ -222,7 +222,7 @@ storage-backend: "local" +@@ -240,7 +240,7 @@ storage-backend: "local" # this directory, and create new subdirectories and files within it. # Examples: ["/home/gotosocial/storage", "/opt/gotosocial/datastorage"] # Default: "/gotosocial/storage" @@ -24,7 +24,7 @@ ########################### ##### STATUSES CONFIG ##### -@@ -288,7 +288,7 @@ letsencrypt-port: 80 +@@ -306,7 +306,7 @@ letsencrypt-port: 80 # In any case, make sure GoToSocial has permissions to write to / read from this directory. # Examples: ["/home/gotosocial/storage/certs", "/acmecerts"] # Default: "/gotosocial/storage/certs" diff --git a/net-im/gotosocial/pkg-plist b/net-im/gotosocial/pkg-plist index 3ed021ac1e03..325d25f3a43d 100644 --- a/net-im/gotosocial/pkg-plist +++ b/net-im/gotosocial/pkg-plist @@ -1,6 +1,15 @@ @sample etc/gotosocial/config.yaml.sample -%%WWWDIR%%/assets/base.css -%%WWWDIR%%/assets/colors.css +%%WWWDIR%%/assets/dist/_colors.css +%%WWWDIR%%/assets/dist/admin-panel.js +%%WWWDIR%%/assets/dist/base.css +%%WWWDIR%%/assets/dist/bundle.js +%%WWWDIR%%/assets/dist/frontend.js +%%WWWDIR%%/assets/dist/panels-admin-style.css +%%WWWDIR%%/assets/dist/profile.css +%%WWWDIR%%/assets/dist/status.css +%%WWWDIR%%/assets/dist/user-panel.js +%%WWWDIR%%/assets/swagger.yaml +%%WWWDIR%%/template/frontend.tmpl %%WWWDIR%%/assets/Fork-Awesome/CONTRIBUTORS.md %%WWWDIR%%/assets/Fork-Awesome/css/fork-awesome.css %%WWWDIR%%/assets/Fork-Awesome/css/fork-awesome.min.css @@ -15,7 +24,6 @@ %%WWWDIR%%/assets/Fork-Awesome/fonts/forkawesome-webfont.woff2 %%WWWDIR%%/assets/Fork-Awesome/LICENSES %%WWWDIR%%/assets/logo.png -%%WWWDIR%%/assets/status.css %%WWWDIR%%/assets/tusky.svg %%WWWDIR%%/assets/default_avatars/GoToSocial_icon1.svg %%WWWDIR%%/assets/default_avatars/GoToSocial_icon2.svg @@ -23,7 +31,6 @@ %%WWWDIR%%/assets/default_avatars/GoToSocial_icon4.svg %%WWWDIR%%/assets/default_avatars/GoToSocial_icon5.svg %%WWWDIR%%/assets/default_avatars/GoToSocial_icon6.svg -%%WWWDIR%%/assets/profile.css %%WWWDIR%%/template/profile.tmpl %%WWWDIR%%/template/404.tmpl %%WWWDIR%%/template/authorize.tmpl