svn commit: r558449 - in head/sysutils/rubygem-smart_proxy_salt: . files
Matthias Fechner
mfechner at FreeBSD.org
Sat Dec 19 12:57:23 UTC 2020
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
More information about the svn-ports-all
mailing list