diff options
| author | Matthias Fechner <mfechner@FreeBSD.org> | 2020-12-19 12:57:22 +0000 |
|---|---|---|
| committer | Matthias Fechner <mfechner@FreeBSD.org> | 2020-12-19 12:57:22 +0000 |
| commit | edad6f28a5937bc82642795aea72c3b5204f736a (patch) | |
| tree | e3ca89cc241c1d736a9895d6ca527655d2541263 /sysutils | |
| parent | ae53c2a86bcedfbc0d79bbb928ba7e1b67d81964 (diff) | |
| download | ports-edad6f28a5937bc82642795aea72c3b5204f736a.tar.gz ports-edad6f28a5937bc82642795aea72c3b5204f736a.zip | |
Notes
Diffstat (limited to 'sysutils')
4 files changed, 19 insertions, 19 deletions
diff --git a/sysutils/rubygem-smart_proxy_salt/Makefile b/sysutils/rubygem-smart_proxy_salt/Makefile index bcd09845f6d1..6904bfd1961e 100644 --- a/sysutils/rubygem-smart_proxy_salt/Makefile +++ b/sysutils/rubygem-smart_proxy_salt/Makefile @@ -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} \ diff --git a/sysutils/rubygem-smart_proxy_salt/distinfo b/sysutils/rubygem-smart_proxy_salt/distinfo index 91955d26a84c..986b3c4058d4 100644 --- a/sysutils/rubygem-smart_proxy_salt/distinfo +++ b/sysutils/rubygem-smart_proxy_salt/distinfo @@ -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 diff --git a/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node b/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node index bf841f2d29d8..eb3714b4bd3c 100644 --- a/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node +++ b/sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node @@ -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' diff --git a/sysutils/rubygem-smart_proxy_salt/files/patch-sbin-upload-salt-reports b/sysutils/rubygem-smart_proxy_salt/files/patch-sbin-upload-salt-reports index acd990aed48d..685e337a857b 100644 --- a/sysutils/rubygem-smart_proxy_salt/files/patch-sbin-upload-salt-reports +++ b/sysutils/rubygem-smart_proxy_salt/files/patch-sbin-upload-salt-reports @@ -1,8 +1,8 @@ ---- 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' @@ -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 |