From owner-svn-ports-head@freebsd.org Wed Mar 11 10:44:17 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CB25F25D253; Wed, 11 Mar 2020 10:44:17 +0000 (UTC) (envelope-from egypcio@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48cpVT2sDHz48R5; Wed, 11 Mar 2020 10:44:17 +0000 (UTC) (envelope-from egypcio@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1A496B42A; Wed, 11 Mar 2020 10:44:17 +0000 (UTC) (envelope-from egypcio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02BAiG37049010; Wed, 11 Mar 2020 10:44:16 GMT (envelope-from egypcio@FreeBSD.org) Received: (from egypcio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02BAiGLR049004; Wed, 11 Mar 2020 10:44:16 GMT (envelope-from egypcio@FreeBSD.org) Message-Id: <202003111044.02BAiGLR049004@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: egypcio set sender to egypcio@FreeBSD.org using -f From: =?UTF-8?Q?Vin=c3=adcius_Zavam?= Date: Wed, 11 Mar 2020 10:44:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528225 - in head/net-mgmt/semaphore: . files X-SVN-Group: ports-head X-SVN-Commit-Author: egypcio X-SVN-Commit-Paths: in head/net-mgmt/semaphore: . files X-SVN-Commit-Revision: 528225 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Mar 2020 10:44:17 -0000 Author: egypcio Date: Wed Mar 11 10:44:16 2020 New Revision: 528225 URL: https://svnweb.freebsd.org/changeset/ports/528225 Log: net-mgmt/semaphore: fix 'incomplete file list and wrong search path' PR: 241655 Reported by: marek % mky.waw.pl Added: head/net-mgmt/semaphore/files/patch-db_migrations.go (contents, props changed) Modified: head/net-mgmt/semaphore/Makefile head/net-mgmt/semaphore/pkg-plist Modified: head/net-mgmt/semaphore/Makefile ============================================================================== --- head/net-mgmt/semaphore/Makefile Wed Mar 11 09:32:07 2020 (r528224) +++ head/net-mgmt/semaphore/Makefile Wed Mar 11 10:44:16 2020 (r528225) @@ -2,6 +2,7 @@ PORTNAME= semaphore PORTVERSION= 2.5.1 +PORTREVISION= 1 DISTVERSIONPREFIX= v PORTREVISION= 1 CATEGORIES= net-mgmt @@ -9,8 +10,6 @@ CATEGORIES= net-mgmt MAINTAINER= egypcio@FreeBSD.org COMMENT= Open Source alternative to Ansible Tower -BROKEN= unfetchable - LICENSE= MIT LICENSE_FILE= ${GO_WRKSRC}/LICENSE @@ -67,15 +66,14 @@ GH_TUPLE= ansible-semaphore:semaphore-vendor:a44f7be:a go-mgo:mgo:3f83fa5:pkgin4/vendor/gopkg.in/mgo.v2 \ go-yaml:yaml:v2.2.1:pkgin5/vendor/gopkg.in/yaml.v2 -OPTIONS_DEFINE= MYSQL -MYSQL_USES= mysql - post-patch: ${REINPLACE_CMD} 's/%%PORTVERSION%%/${PORTVERSION}/g' \ ${WRKSRC}/util/config.go post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/semaphore - ${CP} ${WRKSRC}/config.json ${STAGEDIR}${PREFIX}/etc/semaphore/semaphore_config.json.sample + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/${PORTNAME} + ${CP} ${WRKSRC}/config.json ${STAGEDIR}${PREFIX}/etc/${PORTNAME}/semaphore_config.json.sample + ${MKDIR} ${STAGEDIR}${PREFIX}/share/${PORTNAME} + ${CP} ${WRKSRC}/db/migrations/*.sql ${STAGEDIR}${PREFIX}/share/${PORTNAME} .include Added: head/net-mgmt/semaphore/files/patch-db_migrations.go ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/semaphore/files/patch-db_migrations.go Wed Mar 11 10:44:16 2020 (r528225) @@ -0,0 +1,11 @@ +--- db/migrations.go.orig 2020-02-10 17:37:11 UTC ++++ db/migrations.go +@@ -9,7 +9,7 @@ import ( + log "github.com/Sirupsen/logrus" + ) + +-var dbAssets = packr.NewBox("./migrations") ++var dbAssets = packr.NewBox("/usr/local/share/semaphore") + + // CheckExists queries the database to see if a migration table with this version id exists already + func (version *Version) CheckExists() (bool, error) { Modified: head/net-mgmt/semaphore/pkg-plist ============================================================================== --- head/net-mgmt/semaphore/pkg-plist Wed Mar 11 09:32:07 2020 (r528224) +++ head/net-mgmt/semaphore/pkg-plist Wed Mar 11 10:44:16 2020 (r528225) @@ -1,2 +1,21 @@ bin/semaphore @sample %%ETCDIR%%/semaphore_config.json.sample +%%DATADIR%%/v0.0.0.sql +%%DATADIR%%/v0.1.0.sql +%%DATADIR%%/v1.0.0.sql +%%DATADIR%%/v1.1.0.sql +%%DATADIR%%/v1.2.0.sql +%%DATADIR%%/v1.3.0.sql +%%DATADIR%%/v1.4.0.sql +%%DATADIR%%/v1.5.0.sql +%%DATADIR%%/v1.6.0.sql +%%DATADIR%%/v1.7.0.sql +%%DATADIR%%/v1.8.0.sql +%%DATADIR%%/v1.9.0.sql +%%DATADIR%%/v2.2.1.sql +%%DATADIR%%/v2.3.0.sql +%%DATADIR%%/v2.3.1.sql +%%DATADIR%%/v2.3.2.sql +%%DATADIR%%/v2.4.0.sql +%%DATADIR%%/v2.5.0.sql +