cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sysutils/rubygem-smart_proxy_salt: update 2.1.9 -> 3.1.2

Browse Source 
- Release adds Python 3 support to report upload script

Changes:        https://github.com/theforeman/smart_proxy_salt/commits/master

PR:             242761
Submitted by:   junovitch
This commit is contained in:
Matthias Fechner 2020-12-19 12:57:22 +00:00
parent ae53c2a86b
commit edad6f28a5
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=558449
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sysutils/rubygem-smart_proxy_salt/Makefile
View File

@ -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} \

6
sysutils/rubygem-smart_proxy_salt/distinfo
View File

@ -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

10
sysutils/rubygem-smart_proxy_salt/files/patch-bin-foreman-node
View File

@ -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'

14
sysutils/rubygem-smart_proxy_salt/files/patch-sbin-upload-salt-reports
View File

@ -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