67 Commits

Author SHA1 Message Date
robert
abaf66394a apply better patches for the CVE-2020-11652 CVE from
https://github.com/rossengeorgiev/salt-security-backports

ok naddy@, sthen@
2020-05-06 18:54:08 +00:00
robert
63530a4cbf backport patches for two security issues:
commit f47e4856497231eb672da2ce0df3e641581d47e6
Author: Daniel A. Wozniak <dwozniak@saltstack.com>
Date:   Mon Apr 13 06:41:04 2020 +0000

    Fix CVE-2020-11651

    Resolve issue which allows access to un-intended methods in the
    ClearFuncs class of the salt-master process

commit 7bd0ab195fbec4f34523dad11149f741c154e2b7
Author: Daniel A. Wozniak <dwozniak@saltstack.com>
Date:   Mon Apr 13 06:44:58 2020 +0000

    Fix CVE-2020-11652

    Sanitize paths in ClearFuncs methods provided by salt-master. This
    ensures we do not allow access to un-intended files and directories.

ok sthen@, jasper@
2020-05-01 08:01:08 +00:00
jasper
df48dc5abd fix use of deprecated functions after the py-git2-0.27.4 update
pointed out by florian@
2019-02-28 16:34:59 +00:00
jasper
0a83c4c061 update to salt-2018.3.3 2019-01-28 19:25:27 +00:00
jasper
2d12e72a76 update to salt-2018.3.2 2018-07-09 12:28:05 +00:00
jasper
ed98ae7fcd don't crash when calling swapctl fails, i.e. when there's no swap configured
spotted by juanfra@
2018-05-17 12:51:10 +00:00
robert
7c24292864 fix path to zabbix_send to be able to use zabbix as a returner
ok jasper@
2018-04-25 17:16:19 +00:00
jasper
8134ad9721 update to salt-2018.3.0
https://docs.saltstack.com/en/latest/topics/releases/2018.3.0.html
2018-04-25 10:02:48 +00:00
jasper
c6ef4fb01d unbreak starting a salt_proxy through beacons
ok aja@ (MAINTAINER)
2018-01-27 15:09:30 +00:00
jasper
8294703cea fix crash when unable to apply a value with sysctl
ok aja@ (MAINTAINER)
2018-01-02 18:54:22 +00:00
jasper
5cbccc86a7 - fix latest_version for installed packages
- have purge pass '-cqq' to pkg_delete to actually purge packages
- implement support for upgrading packages on openbsd

ok aja@ (MAINTAINER)
2017-12-20 16:21:46 +00:00
jasper
efb088afd3 - implement status.w for OpenBSD
- tweak status.meminfo to use more descriptive fields

all the status module changes have also been merged upstream now

ok aja@ (MAINTAINER)
2017-12-18 21:06:02 +00:00
jasper
9e45944c51 Add OpenBSD support to:
- status.cpuinfo
- status.cpustats
- status.meminfo
- status.netstats
- status.version

ok aja@ (MAINTAINER)
2017-12-10 12:46:49 +00:00
jasper
d168dce8ae remove usage of option (GSSAPIAuthentication) that's not supported by our ssh client
and breaks salt-ssh otherwise.

ok aja@ (MAINTAINER)
2017-12-06 12:24:02 +00:00
ajacoutot
0ebd959aad Update to salt-2016.11.0. 2016-11-23 09:41:20 +00:00
ajacoutot
793a5adac7 Update to salt-2016.3.2. 2016-07-30 14:27:29 +00:00
ajacoutot
7df0fcb7e7 Merged upstream. 2016-07-11 14:24:32 +00:00
ajacoutot
1faa677fbb Unbreak archive.extracted.
adapted from a diff by Florian Ermisch
2016-07-10 08:50:35 +00:00
ajacoutot
a4663c34bf Pushed upstream. 2016-06-16 16:37:23 +00:00
ajacoutot
e4b29076a5 Unbreak mount.active.
reported by viq
2016-06-16 08:53:47 +00:00
ajacoutot
049611ef33 Update to salt-2016.3.0. 2016-05-26 12:22:40 +00:00
ajacoutot
22a9a2ba06 Fix a few warnings (from upstream). 2016-04-07 17:15:32 +00:00
ajacoutot
8378e7860c Update to salt-2015.8.1. 2015-10-14 18:21:31 +00:00
ajacoutot
d2b3c77ff8 Don't check for proxy in the individual is_linux/is_windows/etc functions.
This breaks too many things. -- from upstream

bogus output reported by viq, thanks!
2015-09-26 09:13:26 +00:00
ajacoutot
63f288aa19 Update to salt-2015.8.0. 2015-09-11 07:19:12 +00:00
ajacoutot
65fb303cb8 Pushed upstream. 2015-07-15 19:43:26 +00:00
ajacoutot
32b2ccd260 Use new rcctl syntax. 2015-07-15 03:09:35 +00:00
ajacoutot
0beacb410f Update to salt-2015.5.3. 2015-07-11 16:29:25 +00:00
ajacoutot
d9730dd4ef Better patch. 2015-07-08 08:16:18 +00:00
ajacoutot
0b9f5f67ba Unbreak service.enable.
python_shell now defaults to False but we need it enabled  in this case to
combine commands.

from "viq", thanks!
2015-07-07 11:25:51 +00:00
ajacoutot
02e9fb7392 Unbreak rcctl(1) usage. 2015-07-03 12:08:14 +00:00
ajacoutot
efe758d488 Merged upstream. 2015-06-05 15:25:07 +00:00
ajacoutot
2a431ac341 Add _openbsd_remotes_on(). That's an helper function that allows us to
get rid of the lsof(8) dependency.
2015-06-05 10:39:25 +00:00
ajacoutot
933a58e16e Update to salt-2015.5.1. 2015-05-24 07:37:23 +00:00
ajacoutot
3fc7998607 Merged upstream. 2015-05-08 07:46:17 +00:00
ajacoutot
d0c4c2d18d Update to salt-2015.5.0. 2015-05-07 09:15:55 +00:00
ajacoutot
3e5a5a2600 Update to salt-2014.7.3. 2015-03-27 14:40:04 +00:00
ajacoutot
fbe8ccaa4b Update to salt-2014.7.2. 2015-02-13 07:03:44 +00:00
ajacoutot
eebeead54e Update to salt-2014.7.1. 2015-01-16 13:19:48 +00:00
ajacoutot
b0c8a1f488 Update to salt-2014.7.0. 2015-01-07 09:57:39 +00:00
ajacoutot
f15307ef5a Update to salt-2014.1.12. 2014-10-11 08:42:46 +00:00
ajacoutot
791254db5d Merge from upstream:
Return pillar data if not external pillar data.
2014-10-01 13:48:48 +00:00
ajacoutot
bcb859e54f Always add a newline character for 'contents'; already fixed in salt->=2014.7.0. 2014-09-11 06:28:41 +00:00
ajacoutot
9cf3b5467b Update to salt-2014.1.11. 2014-09-10 06:08:42 +00:00
ajacoutot
d0264d124c Fix tests to properly recognize OpenBSD.
openbsdrcctl: extend enabled() to check flags
On OpenBSD, it's possible to define particular flags a daemon should be
enabled with. To make sure the flags are properly updated when changed
(in pillars or states), we return a service as "disabled" if the
currently configured flags do not match the provided ones; this ensures
/etc/rc.conf.local is always in sync.

All patches merged upstream.
2014-09-05 08:27:20 +00:00
ajacoutot
a095d7f530 All patches have been committed upstream. 2014-09-02 17:18:55 +00:00
ajacoutot
2c88076e8e Fix arp() and mod_hostname() to work on OpenBSD. 2014-09-02 14:01:51 +00:00
ajacoutot
d57d1968c0 Use strip() and lstrip() instead of replace(). 2014-09-02 13:30:13 +00:00
ajacoutot
f471328f22 Fix the timezone module on BSDs. 2014-09-02 09:14:45 +00:00
ajacoutot
34bc35766c Fix the postgres module on OpenBSD. 2014-09-02 08:41:43 +00:00