Date: Thu, 22 Mar 2012 18:24:23 GMT From: Christer Edwards <christer.edwards@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/166322: sysutils/salt - critical patch - loss of functionality Message-ID: <201203221824.q2MIONj2044993@red.freebsd.org> Resent-Message-ID: <201203221830.q2MIU1YY063008@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 166322
>Category: ports
>Synopsis: sysutils/salt - critical patch - loss of functionality
>Confidential: no
>Severity: critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Mar 22 18:30:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Christer Edwards
>Release: 9.0-RELEASE
>Organization:
>Environment:
FreeBSD isabel 9.0-RELEASE FreeBSD 9.0-RELEASE #1: Sun Mar 18 13:42:35 MDT 2012 root@isabel:/usr/obj/usr/src/sys/ISABEL amd64
>Description:
A critical bug was missed in testing the sysutils/salt 0.9.8 release. The current port is critically broken. The attached diff suggests two patches to regain functionality and address a python warning message.
>How-To-Repeat:
>Fix:
In the even the attached .diff is not clear, a file needs to be created at files/patch-kvm_hyper.py to address a FreeBSD specific issue:
--- salt-0.9.8/kvm_hyper.py 2012-03-22 10:57:13.019199302 -0600
+++ salt/modules/kvm_hyper.py 2012-03-22 10:57:45.441204588 -0600
@@ -46,6 +46,8 @@
return False
if __grains__['virtual'] != 'physical':
return False
+ if __grains__['kernel'] != 'Linux':
+ return False
if 'kvm_' not in open('/proc/modules').read():
return False
if not has_libvirt:
Without this addition the FreeBSD salt minion chokes trying to read '/proc/modules' and exits. This means salt is essentially non-functioning on FreeBSD at this time.
The second part of the attached diff is a minor update to the Python setup.py, which simply bypasses a warning message during build. It is non-critical.
Patch attached with submission follows:
diff -ruN salt-0.9.8/files/patch-kvm_hyper.py salt-0.9.8_1/files/patch-kvm_hyper.py
--- salt-0.9.8/files/patch-kvm_hyper.py 1969-12-31 17:00:00.000000000 -0700
+++ salt-0.9.8_1/files/patch-kvm_hyper.py 2012-03-22 11:41:04.998199701 -0600
@@ -0,0 +1,11 @@
+--- salt-0.9.8/kvm_hyper.py 2012-03-22 10:57:13.019199302 -0600
++++ salt/modules/kvm_hyper.py 2012-03-22 10:57:45.441204588 -0600
+@@ -46,6 +46,8 @@
+ return False
+ if __grains__['virtual'] != 'physical':
+ return False
++ if __grains__['kernel'] != 'Linux':
++ return False
+ if 'kvm_' not in open('/proc/modules').read():
+ return False
+ if not has_libvirt:
diff -ruN salt-0.9.8/files/patch-setup.py salt-0.9.8_1/files/patch-setup.py
--- salt-0.9.8/files/patch-setup.py 2012-01-25 00:16:18.000000000 -0700
+++ salt-0.9.8_1/files/patch-setup.py 2012-03-22 12:09:05.477195875 -0600
@@ -1,6 +1,6 @@
---- salt-0.9.6/setup.py 2012-01-21 02:18:08.000000000 +0000
-+++ setup.py 2012-01-22 19:21:35.158004570 +0000
-@@ -44,7 +44,7 @@
+--- salt-0.9.8/setup.py 2012-03-21 11:46:26.000000000 -0600
++++ setup.py 2012-03-22 11:57:51.926196304 -0600
+@@ -47,7 +47,7 @@
if 'SYSCONFDIR' in os.environ:
etc_path = os.environ['SYSCONFDIR']
else:
@@ -9,7 +9,7 @@
libraries = ['ws2_32'] if sys.platform == 'win32' else []
-@@ -91,10 +91,10 @@
+@@ -98,10 +98,10 @@
'scripts/salt-run',
'scripts/salt'],
data_files=[(os.path.join(etc_path, 'salt'),
@@ -23,7 +23,7 @@
['doc/man/salt-master.1',
'doc/man/salt-key.1',
'doc/man/salt.1',
-@@ -104,7 +104,7 @@
+@@ -111,9 +111,8 @@
'doc/man/salt-run.1',
'doc/man/salt-minion.1',
]),
@@ -32,3 +32,5 @@
['doc/man/salt.7',
]),
],
+- install_requires=requirements,
+ )
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201203221824.q2MIONj2044993>