From owner-svn-ports-head@freebsd.org Sat Dec 19 12:57:23 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 90D274C6B36; Sat, 19 Dec 2020 12:57:23 +0000 (UTC) (envelope-from mfechner@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cym3R3h5Gz3Qq4; Sat, 19 Dec 2020 12:57:23 +0000 (UTC) (envelope-from mfechner@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 712E71D5DB; Sat, 19 Dec 2020 12:57:23 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BJCvNfQ026805; Sat, 19 Dec 2020 12:57:23 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BJCvMt8026799; Sat, 19 Dec 2020 12:57:22 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <202012191257.0BJCvMt8026799@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Sat, 19 Dec 2020 12:57:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r558449 - in head/sysutils/rubygem-smart_proxy_salt: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: in head/sysutils/rubygem-smart_proxy_salt: . files X-SVN-Commit-Revision: 558449 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.34 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: Sat, 19 Dec 2020 12:57:23 -0000 Author: mfechner Date: Sat Dec 19 12:57:22 2020 New Revision: 558449 URL: https://svnweb.freebsd.org/changeset/ports/558449 Log: sysutils/rubygem-smart_proxy_salt: update 2.1.9 -> 3.1.2 - Release adds Python 3 support to report upload script Changes: https://github.com/theforeman/smart_proxy_salt/commits/master PR: 242761 Submitted by: junovitch Modified: head/sysutils/rubygem-smart_proxy_salt/Makefile head/sysutils/rubygem-smart_proxy_salt/distinfo head/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node head/sysutils/rubygem-smart_proxy_salt/files/patch-sbin-upload-salt-reports Modified: head/sysutils/rubygem-smart_proxy_salt/Makefile ============================================================================== --- head/sysutils/rubygem-smart_proxy_salt/Makefile Sat Dec 19 12:36:24 2020 (r558448) +++ head/sysutils/rubygem-smart_proxy_salt/Makefile Sat Dec 19 12:57:22 2020 (r558449) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= smart_proxy_salt -PORTVERSION= 2.1.9 +PORTVERSION= 3.1.2 CATEGORIES= sysutils ruby MASTER_SITES= RG @@ -14,10 +14,10 @@ LICENSE= GPLv3 RUN_DEPENDS= foreman-proxy>=1.8.0:net/foreman-proxy \ ${PYTHON_PKGNAMEPREFIX}salt>0:sysutils/py-salt@${PY_FLAVOR} -NO_ARCH= yes - -USE_RUBY= yes USES= gem python +USE_RUBY= yes + +NO_ARCH= yes post-patch: @${REINPLACE_CMD} \ Modified: head/sysutils/rubygem-smart_proxy_salt/distinfo ============================================================================== --- head/sysutils/rubygem-smart_proxy_salt/distinfo Sat Dec 19 12:36:24 2020 (r558448) +++ head/sysutils/rubygem-smart_proxy_salt/distinfo Sat Dec 19 12:57:22 2020 (r558449) @@ -1,3 +1,3 @@ -TIMESTAMP = 1525719377 -SHA256 (rubygem/smart_proxy_salt-2.1.9.gem) = 4de1c4cbd882637052002d49764a4a7bbc58f4f100c026f8b7c0dd0a3dcbd4b0 -SIZE (rubygem/smart_proxy_salt-2.1.9.gem) = 23552 +TIMESTAMP = 1608381889 +SHA256 (rubygem/smart_proxy_salt-3.1.2.gem) = 38d436c75b8b44413df1fe334605ce45745749659430b7fac7b590c9b91549bd +SIZE (rubygem/smart_proxy_salt-3.1.2.gem) = 24576 Modified: head/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node ============================================================================== --- head/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node Sat Dec 19 12:36:24 2020 (r558448) +++ head/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node Sat Dec 19 12:57:22 2020 (r558449) @@ -1,11 +1,11 @@ ---- bin/foreman-node.orig 2015-05-15 19:21:46 UTC +--- bin/foreman-node.orig 2020-12-19 12:50:21 UTC +++ bin/foreman-node -@@ -5,7 +5,7 @@ +@@ -7,7 +7,7 @@ require 'yaml' --$settings_file = '/etc/salt/foreman.yaml' -+$settings_file = '%%LOCALBASE%%/etc/salt/foreman.yaml' - SETTINGS = YAML.load_file($settings_file) +-settings_file = '/etc/salt/foreman.yaml' ++settings_file = '%%LOCALBASE%%/etc/salt/foreman.yaml' + SETTINGS = YAML.load_file(settings_file) require 'net/http' Modified: head/sysutils/rubygem-smart_proxy_salt/files/patch-sbin-upload-salt-reports ============================================================================== --- head/sysutils/rubygem-smart_proxy_salt/files/patch-sbin-upload-salt-reports Sat Dec 19 12:36:24 2020 (r558448) +++ head/sysutils/rubygem-smart_proxy_salt/files/patch-sbin-upload-salt-reports Sat Dec 19 12:57:22 2020 (r558449) @@ -1,9 +1,9 @@ ---- sbin/upload-salt-reports.orig 2014-11-24 22:04:49.000000000 +0100 -+++ sbin/upload-salt-reports 2014-11-24 22:04:56.000000000 +0100 -@@ -1,9 +1,9 @@ - #!/usr/bin/env python - # Uploads reports from the Salt job cache to Foreman +--- sbin/upload-salt-reports.orig 2020-12-19 12:46:33 UTC ++++ sbin/upload-salt-reports +@@ -3,9 +3,9 @@ + from __future__ import print_function + -LAST_UPLOADED = '/etc/salt/last_uploaded' -FOREMAN_CONFIG = '/etc/salt/foreman.yaml' -LOCK_FILE = '/var/lock/salt-report-upload.lock' @@ -11,5 +11,5 @@ +FOREMAN_CONFIG = '%%LOCALBASE%%/etc/salt/foreman.yaml' +LOCK_FILE = '/var/run/salt-report-upload.lock' - import urllib - import httplib + try: + from http.client import HTTPConnection, HTTPSConnection