NetBSD Problem Report #50507
From www@NetBSD.org Wed Dec 9 04:21:23 2015
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.NetBSD.org [199.233.217.200])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK))
by mollari.NetBSD.org (Postfix) with ESMTPS id 20F6CA663B
for <gnats-bugs@gnats.NetBSD.org>; Wed, 9 Dec 2015 04:21:23 +0000 (UTC)
Message-Id: <20151209042121.80467A6644@mollari.NetBSD.org>
Date: Wed, 9 Dec 2015 04:21:21 +0000 (UTC)
From: Tr@visPaul.me
Reply-To: Tr@visPaul.me
To: gnats-bugs@NetBSD.org
Subject: Update salt to 2015.8.3
X-Send-Pr-Version: www-1.0
>Number: 50507
>Category: pkg
>Synopsis: Update salt to 2015.8.3
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: pkg-manager
>State: closed
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Wed Dec 09 04:25:00 +0000 2015
>Closed-Date: Fri Dec 11 00:27:41 +0000 2015
>Last-Modified: Sun Feb 07 22:30:01 +0000 2016
>Originator: Travis Paul
>Release: pkgsrc-current
>Organization:
>Environment:
>Description:
Update salt to latest stable release which fixes CVE-2015-8034. Also fix hardcoded paths that effect SmartOS.
>How-To-Repeat:
See release notes here: https://docs.saltstack.com/en/develop/topics/releases/2015.8.3.html
Also attempting to use salt on SmartOS in the global zone will fail with the following output due to hardcoding or /opt/local in salt/utils/rsax931.py and salt/grains/core.py:
# salt-minion
Traceback (most recent call last):
File "/opt/pkg/bin/salt-minion", line 26, in <module>
salt_minion()
File "/opt/pkg/lib/python2.7/site-packages/salt/scripts.py", line 106, in salt_minion
import salt.cli.daemons
File "/opt/pkg/lib/python2.7/site-packages/salt/cli/daemons.py", line 47, in <module>
from salt.utils import parsers, ip_bracket
File "/opt/pkg/lib/python2.7/site-packages/salt/utils/parsers.py", line 26, in <module>
import salt.config as config
File "/opt/pkg/lib/python2.7/site-packages/salt/config.py", line 40, in <module>
import salt.utils.sdb
File "/opt/pkg/lib/python2.7/site-packages/salt/utils/sdb.py", line 9, in <module>
import salt.loader
File "/opt/pkg/lib/python2.7/site-packages/salt/loader.py", line 30, in <module>
import salt.utils.event
File "/opt/pkg/lib/python2.7/site-packages/salt/utils/event.py", line 81, in <module>
import salt.payload
File "/opt/pkg/lib/python2.7/site-packages/salt/payload.py", line 17, in <module>
import salt.crypt
File "/opt/pkg/lib/python2.7/site-packages/salt/crypt.py", line 37, in <module>
import salt.utils.rsax931
File "/opt/pkg/lib/python2.7/site-packages/salt/utils/rsax931.py", line 69, in <module>
libcrypto = _init_libcrypto()
File "/opt/pkg/lib/python2.7/site-packages/salt/utils/rsax931.py", line 47, in _init_libcrypto
libcrypto = _load_libcrypto()
File "/opt/pkg/lib/python2.7/site-packages/salt/utils/rsax931.py", line 40, in _load_libcrypto
raise OSError('Cannot locate OpenSSL libcrypto')
OSError: Cannot locate OpenSSL libcrypto
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/salt/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- Makefile 7 Dec 2015 21:51:53 -0000 1.32
+++ Makefile 8 Dec 2015 16:50:07 -0000
@@ -1,9 +1,8 @@
# $NetBSD: Makefile,v 1.32 2015/12/07 21:51:53 wiz Exp $
-DISTNAME= salt-2015.8.1
-PKGREVISION= 2
+DISTNAME= salt-2015.8.3
CATEGORIES= sysutils
-MASTER_SITES= https://pypi.python.org/packages/source/s/salt/
+MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://saltstack.org/
@@ -58,11 +57,14 @@
SUBST_MESSAGE.fix-paths=Fixing hardcoded paths
SUBST_FILES.fix-paths= conf/*
SUBST_FILES.fix-paths+= doc/man/* salt/modules/munin.py setup.py
+SUBST_FILES.fix-paths+= salt/utils/rsax931.py salt/grains/core.py
SUBST_SED.fix-paths= -e 's,/etc/salt,${PKG_SYSCONFDIR},g'
SUBST_SED.fix-paths+= -e 's,/srv/salt,${PKG_SYSCONFDIR}/states,g'
SUBST_SED.fix-paths+= -e 's,/srv/pillar,${PKG_SYSCONFDIR}/pillar,g'
SUBST_SED.fix-paths+= -e 's,/etc/munin,${PKG_SYSCONFBASEDIR}/munin,g'
SUBST_SED.fix-paths+= -e 's,share/man,man,g'
+SUBST_SED.fix-paths+= -e 's,/opt/local/lib,${PREFIX}/lib,g'
+SUBST_SED.fix-paths+= -e 's,/opt/local/etc,${PKG_SYSCONFBASEDIR},g'
post-install:
${INSTALL_DATA} ${WRKSRC}/conf/master ${DESTDIR}${EGDIR}/
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/salt/PLIST,v
retrieving revision 1.13
diff -u -r1.13 PLIST
--- PLIST 10 Nov 2015 14:48:39 -0000 1.13
+++ PLIST 8 Dec 2015 16:50:07 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2015/11/10 14:48:39 sborrill Exp $
+@comment $NetBSD$
bin/salt
bin/salt-api
bin/salt-call
@@ -83,6 +83,9 @@
${PYSITELIB}/salt/beacons/network_info.py
${PYSITELIB}/salt/beacons/network_info.pyc
${PYSITELIB}/salt/beacons/network_info.pyo
+${PYSITELIB}/salt/beacons/proxy_example.py
+${PYSITELIB}/salt/beacons/proxy_example.pyc
+${PYSITELIB}/salt/beacons/proxy_example.pyo
${PYSITELIB}/salt/beacons/ps.py
${PYSITELIB}/salt/beacons/ps.pyc
${PYSITELIB}/salt/beacons/ps.pyo
@@ -446,6 +449,9 @@
${PYSITELIB}/salt/grains/__init__.py
${PYSITELIB}/salt/grains/__init__.pyc
${PYSITELIB}/salt/grains/__init__.pyo
+${PYSITELIB}/salt/grains/chronos.py
+${PYSITELIB}/salt/grains/chronos.pyc
+${PYSITELIB}/salt/grains/chronos.pyo
${PYSITELIB}/salt/grains/core.py
${PYSITELIB}/salt/grains/core.pyc
${PYSITELIB}/salt/grains/core.pyo
@@ -458,15 +464,24 @@
${PYSITELIB}/salt/grains/extra.py
${PYSITELIB}/salt/grains/extra.pyc
${PYSITELIB}/salt/grains/extra.pyo
+${PYSITELIB}/salt/grains/fx2.py
+${PYSITELIB}/salt/grains/fx2.pyc
+${PYSITELIB}/salt/grains/fx2.pyo
${PYSITELIB}/salt/grains/junos.py
${PYSITELIB}/salt/grains/junos.pyc
${PYSITELIB}/salt/grains/junos.pyo
+${PYSITELIB}/salt/grains/marathon.py
+${PYSITELIB}/salt/grains/marathon.pyc
+${PYSITELIB}/salt/grains/marathon.pyo
${PYSITELIB}/salt/grains/mdadm.py
${PYSITELIB}/salt/grains/mdadm.pyc
${PYSITELIB}/salt/grains/mdadm.pyo
${PYSITELIB}/salt/grains/opts.py
${PYSITELIB}/salt/grains/opts.pyc
${PYSITELIB}/salt/grains/opts.pyo
+${PYSITELIB}/salt/grains/philips_hue.py
+${PYSITELIB}/salt/grains/philips_hue.pyc
+${PYSITELIB}/salt/grains/philips_hue.pyo
${PYSITELIB}/salt/grains/rest_sample.py
${PYSITELIB}/salt/grains/rest_sample.pyc
${PYSITELIB}/salt/grains/rest_sample.pyo
@@ -620,12 +635,18 @@
${PYSITELIB}/salt/modules/cassandra_cql.py
${PYSITELIB}/salt/modules/cassandra_cql.pyc
${PYSITELIB}/salt/modules/cassandra_cql.pyo
+${PYSITELIB}/salt/modules/chassis.py
+${PYSITELIB}/salt/modules/chassis.pyc
+${PYSITELIB}/salt/modules/chassis.pyo
${PYSITELIB}/salt/modules/chef.py
${PYSITELIB}/salt/modules/chef.pyc
${PYSITELIB}/salt/modules/chef.pyo
${PYSITELIB}/salt/modules/chocolatey.py
${PYSITELIB}/salt/modules/chocolatey.pyc
${PYSITELIB}/salt/modules/chocolatey.pyo
+${PYSITELIB}/salt/modules/chronos.py
+${PYSITELIB}/salt/modules/chronos.pyc
+${PYSITELIB}/salt/modules/chronos.pyo
${PYSITELIB}/salt/modules/cloud.py
${PYSITELIB}/salt/modules/cloud.pyc
${PYSITELIB}/salt/modules/cloud.pyo
@@ -722,6 +743,9 @@
${PYSITELIB}/salt/modules/drac.py
${PYSITELIB}/salt/modules/drac.pyc
${PYSITELIB}/salt/modules/drac.pyo
+${PYSITELIB}/salt/modules/dracr.py
+${PYSITELIB}/salt/modules/dracr.pyc
+${PYSITELIB}/salt/modules/dracr.pyo
${PYSITELIB}/salt/modules/drbd.py
${PYSITELIB}/salt/modules/drbd.pyc
${PYSITELIB}/salt/modules/drbd.pyo
@@ -953,6 +977,9 @@
${PYSITELIB}/salt/modules/makeconf.py
${PYSITELIB}/salt/modules/makeconf.pyc
${PYSITELIB}/salt/modules/makeconf.pyo
+${PYSITELIB}/salt/modules/marathon.py
+${PYSITELIB}/salt/modules/marathon.pyc
+${PYSITELIB}/salt/modules/marathon.pyo
${PYSITELIB}/salt/modules/match.py
${PYSITELIB}/salt/modules/match.pyc
${PYSITELIB}/salt/modules/match.pyo
@@ -1082,6 +1109,9 @@
${PYSITELIB}/salt/modules/pecl.py
${PYSITELIB}/salt/modules/pecl.pyc
${PYSITELIB}/salt/modules/pecl.pyo
+${PYSITELIB}/salt/modules/philips_hue.py
+${PYSITELIB}/salt/modules/philips_hue.pyc
+${PYSITELIB}/salt/modules/philips_hue.pyo
${PYSITELIB}/salt/modules/pillar.py
${PYSITELIB}/salt/modules/pillar.pyc
${PYSITELIB}/salt/modules/pillar.pyo
@@ -1172,9 +1202,6 @@
${PYSITELIB}/salt/modules/rest_package.py
${PYSITELIB}/salt/modules/rest_package.pyc
${PYSITELIB}/salt/modules/rest_package.pyo
-${PYSITELIB}/salt/modules/rest_sample.py
-${PYSITELIB}/salt/modules/rest_sample.pyc
-${PYSITELIB}/salt/modules/rest_sample.pyo
${PYSITELIB}/salt/modules/rest_service.py
${PYSITELIB}/salt/modules/rest_service.pyc
${PYSITELIB}/salt/modules/rest_service.pyo
@@ -1295,6 +1322,12 @@
${PYSITELIB}/salt/modules/ssh.py
${PYSITELIB}/salt/modules/ssh.pyc
${PYSITELIB}/salt/modules/ssh.pyo
+${PYSITELIB}/salt/modules/ssh_package.py
+${PYSITELIB}/salt/modules/ssh_package.pyc
+${PYSITELIB}/salt/modules/ssh_package.pyo
+${PYSITELIB}/salt/modules/ssh_service.py
+${PYSITELIB}/salt/modules/ssh_service.pyc
+${PYSITELIB}/salt/modules/ssh_service.pyo
${PYSITELIB}/salt/modules/state.py
${PYSITELIB}/salt/modules/state.pyc
${PYSITELIB}/salt/modules/state.pyo
@@ -1451,6 +1484,9 @@
${PYSITELIB}/salt/modules/win_system.py
${PYSITELIB}/salt/modules/win_system.pyc
${PYSITELIB}/salt/modules/win_system.pyo
+${PYSITELIB}/salt/modules/win_task.py
+${PYSITELIB}/salt/modules/win_task.pyc
+${PYSITELIB}/salt/modules/win_task.pyo
${PYSITELIB}/salt/modules/win_timezone.py
${PYSITELIB}/salt/modules/win_timezone.pyc
${PYSITELIB}/salt/modules/win_timezone.pyo
@@ -1673,12 +1709,27 @@
${PYSITELIB}/salt/proxy/__init__.py
${PYSITELIB}/salt/proxy/__init__.pyc
${PYSITELIB}/salt/proxy/__init__.pyo
+${PYSITELIB}/salt/proxy/chronos.py
+${PYSITELIB}/salt/proxy/chronos.pyc
+${PYSITELIB}/salt/proxy/chronos.pyo
+${PYSITELIB}/salt/proxy/fx2.py
+${PYSITELIB}/salt/proxy/fx2.pyc
+${PYSITELIB}/salt/proxy/fx2.pyo
${PYSITELIB}/salt/proxy/junos.py
${PYSITELIB}/salt/proxy/junos.pyc
${PYSITELIB}/salt/proxy/junos.pyo
+${PYSITELIB}/salt/proxy/marathon.py
+${PYSITELIB}/salt/proxy/marathon.pyc
+${PYSITELIB}/salt/proxy/marathon.pyo
+${PYSITELIB}/salt/proxy/philips_hue.py
+${PYSITELIB}/salt/proxy/philips_hue.pyc
+${PYSITELIB}/salt/proxy/philips_hue.pyo
${PYSITELIB}/salt/proxy/rest_sample.py
${PYSITELIB}/salt/proxy/rest_sample.pyc
${PYSITELIB}/salt/proxy/rest_sample.pyo
+${PYSITELIB}/salt/proxy/ssh_sample.py
+${PYSITELIB}/salt/proxy/ssh_sample.pyc
+${PYSITELIB}/salt/proxy/ssh_sample.pyo
${PYSITELIB}/salt/queues/__init__.py
${PYSITELIB}/salt/queues/__init__.pyc
${PYSITELIB}/salt/queues/__init__.pyo
@@ -2111,6 +2162,9 @@
${PYSITELIB}/salt/states/chef.py
${PYSITELIB}/salt/states/chef.pyc
${PYSITELIB}/salt/states/chef.pyo
+${PYSITELIB}/salt/states/chronos_job.py
+${PYSITELIB}/salt/states/chronos_job.pyc
+${PYSITELIB}/salt/states/chronos_job.pyo
${PYSITELIB}/salt/states/cloud.py
${PYSITELIB}/salt/states/cloud.pyc
${PYSITELIB}/salt/states/cloud.pyo
@@ -2132,6 +2186,9 @@
${PYSITELIB}/salt/states/debconfmod.py
${PYSITELIB}/salt/states/debconfmod.pyc
${PYSITELIB}/salt/states/debconfmod.pyo
+${PYSITELIB}/salt/states/dellchassis.py
+${PYSITELIB}/salt/states/dellchassis.pyc
+${PYSITELIB}/salt/states/dellchassis.pyo
${PYSITELIB}/salt/states/disk.py
${PYSITELIB}/salt/states/disk.pyc
${PYSITELIB}/salt/states/disk.pyo
@@ -2270,6 +2327,9 @@
${PYSITELIB}/salt/states/makeconf.py
${PYSITELIB}/salt/states/makeconf.pyc
${PYSITELIB}/salt/states/makeconf.pyo
+${PYSITELIB}/salt/states/marathon_app.py
+${PYSITELIB}/salt/states/marathon_app.pyc
+${PYSITELIB}/salt/states/marathon_app.pyo
${PYSITELIB}/salt/states/mdadm.py
${PYSITELIB}/salt/states/mdadm.pyc
${PYSITELIB}/salt/states/mdadm.pyo
@@ -2667,6 +2727,9 @@
${PYSITELIB}/salt/utils/compat.py
${PYSITELIB}/salt/utils/compat.pyc
${PYSITELIB}/salt/utils/compat.pyo
+${PYSITELIB}/salt/utils/configcomparer.py
+${PYSITELIB}/salt/utils/configcomparer.pyc
+${PYSITELIB}/salt/utils/configcomparer.pyo
${PYSITELIB}/salt/utils/context.py
${PYSITELIB}/salt/utils/context.pyc
${PYSITELIB}/salt/utils/context.pyo
@@ -2898,9 +2961,15 @@
${PYSITELIB}/salt/utils/virt.py
${PYSITELIB}/salt/utils/virt.pyc
${PYSITELIB}/salt/utils/virt.pyo
+${PYSITELIB}/salt/utils/vmware.py
+${PYSITELIB}/salt/utils/vmware.pyc
+${PYSITELIB}/salt/utils/vmware.pyo
${PYSITELIB}/salt/utils/vt.py
${PYSITELIB}/salt/utils/vt.pyc
${PYSITELIB}/salt/utils/vt.pyo
+${PYSITELIB}/salt/utils/vt_helper.py
+${PYSITELIB}/salt/utils/vt_helper.pyc
+${PYSITELIB}/salt/utils/vt_helper.pyo
${PYSITELIB}/salt/utils/winapi.py
${PYSITELIB}/salt/utils/winapi.pyc
${PYSITELIB}/salt/utils/winapi.pyo
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/salt/distinfo,v
retrieving revision 1.15
diff -u -r1.15 distinfo
--- distinfo 10 Nov 2015 14:48:39 -0000 1.15
+++ distinfo 8 Dec 2015 16:50:07 -0000
@@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.15 2015/11/10 14:48:39 sborrill Exp $
-SHA1 (salt-2015.8.1.tar.gz) = ddf97614ad1f281d2bea0703bb959625fa64c222
-RMD160 (salt-2015.8.1.tar.gz) = aec7aa4830aec4649e788322870c8c03a62ca628
-SHA512 (salt-2015.8.1.tar.gz) = d882e3a8e70cf19c64e14c35d4c69fa308b8502d01095ce3f8c383a0ee0b70dbefd4b8eda95205f2cba2fe237279e2a3425daf0d5bf66144fb97ca3be0ec162a
-Size (salt-2015.8.1.tar.gz) = 6527650 bytes
+SHA1 (salt-2015.8.3.tar.gz) = 0457866d5619febc3cdf3b27b2e736b0c4ae3623
+RMD160 (salt-2015.8.3.tar.gz) = 607db5d35545cfb6c4e8676482133a1560f3e896
+SHA512 (salt-2015.8.3.tar.gz) = 18a2c63d5e54d09468189450557974e47f87d8b7dde52beaae678120da1da1e7aecfff18cf0fdfb63a11cd5f6bab102c229462f0afe5e3e858c0c467761c7121
+Size (salt-2015.8.3.tar.gz) = 6757678 bytes
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed
State-Changed-By: wiz@NetBSD.org
State-Changed-When: Fri, 11 Dec 2015 00:27:41 +0000
State-Changed-Why:
Committed, thank you!
From: "Thomas Klausner" <wiz@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc:
Subject: PR/50507 CVS commit: pkgsrc/sysutils/salt
Date: Fri, 11 Dec 2015 00:27:07 +0000
Module Name: pkgsrc
Committed By: wiz
Date: Fri Dec 11 00:27:07 UTC 2015
Modified Files:
pkgsrc/sysutils/salt: Makefile PLIST distinfo
Log Message:
Update salt to 2015.8.3, provided by Travis Paul in PR 50507.
Security Fix
CVE-2015-8034: Saving state.sls cache data to disk with insecure permissions
This affects users of the state.sls function. The state run cache
on the minion was being created with incorrect permissions. This
file could potentially contain sensitive data that was inserted
via jinja into the state SLS files. The permissions for this file
are now being set correctly. Thanks to @zmalone for bringing this
issue to our attention.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/sysutils/salt/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/salt/PLIST
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/salt/distinfo
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
From: Travis Paul <Tr@visPaul.me>
To: gnats-bugs@NetBSD.org
Cc:
Subject: Re: pkg/50507
Date: Sun, 7 Feb 2016 17:24:27 -0500
This patch has been accepted upstream[1], but upstream has not yet made
a new release. Can this patch be added or is it something I need to
continue to keep locally?
[1] https://github.com/saltstack/salt/pull/29777
From: Travis Paul <Tr@visPaul.me>
To: gnats-bugs@NetBSD.org
Cc:
Subject: Re: pkg/50507
Date: Sun, 7 Feb 2016 17:26:33 -0500
Please disregard last message regard upstream. Wrong PR #
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.