* fix(map.jinja): fix useflags regex
When using version inside useflag, the sls_block macro with ebuildpkg regex result in a range error.
Replacing the version argument with uses seem to work as escapes don't really work there.
fix(map.jinja): replace all problematic lines
fix(map.jinja): update available targets
```
----------
ID: php_install_imagick_dev-php-pecl-imagick
Function: pkg.installed
Name: dev-php/pecl-imagick
Result: False
Comment: An exception occurred in this state: Traceback (most recent call last):
File "/usr/lib64/python3.6/site-packages/salt/state.py", line 1933, in call
**cdata['kwargs'])
File "/usr/lib64/python3.6/site-packages/salt/loader.py", line 1951, in wrapper
return f(*args, **kwargs)
File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 1563, in installed
**kwargs)
File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 651, in _find_install_targets
for name, version in desired.items()
File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 652, in <listcomp>
if not (name in cur_pkgs and (version is None or _fulfills_version_string(cur_pkgs[name], version)))
File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 216, in _fulfills_version_string
fullfills_all = fullfills_all and _fulfills_version_spec([installed_version], operator, version_string, ignore_epoch=ignore_epoch)
File "/usr/lib64/python3.6/site-packages/salt/states/pkg.py", line 234, in _fulfills_version_spec
if (oper == '==' and fnmatch.fnmatch(ver, desired_version)) \
File "/usr/lib64/python3.6/fnmatch.py", line 36, in fnmatch
return fnmatchcase(name, pat)
File "/usr/lib64/python3.6/fnmatch.py", line 70, in fnmatchcase
match = _compile_pattern(pat)
File "/usr/lib64/python3.6/fnmatch.py", line 46, in _compile_pattern
return re.compile(res).match
File "/usr/lib64/python3.6/re.py", line 233, in compile
return _compile(pattern, flags)
File "/usr/lib64/python3.6/re.py", line 301, in _compile
p = sre_compile.compile(pattern, flags)
File "/usr/lib64/python3.6/sre_compile.py", line 562, in compile
p = sre_parse.parse(p, flags)
File "/usr/lib64/python3.6/sre_parse.py", line 855, in parse
p = _parse_sub(source, pattern, flags & SRE_FLAG_VERBOSE, 0)
File "/usr/lib64/python3.6/sre_parse.py", line 416, in _parse_sub
not nested and not items))
File "/usr/lib64/python3.6/sre_parse.py", line 765, in _parse
p = _parse_sub(source, state, sub_verbose, nested + 1)
File "/usr/lib64/python3.6/sre_parse.py", line 416, in _parse_sub
not nested and not items))
File "/usr/lib64/python3.6/sre_parse.py", line 553, in _parse
raise source.error(msg, len(this) + 1 + len(that))
sre_constants.error: bad character range 7-3 at position 20
Started: 14:28:26.927898
Duration: 6321.149 ms
Changes:
```
* Use single-quoting
Signed-off-by: Mark Gomersbach <markgomersbach@gmail.com>
```bash
Examining php/map.jinja of type state
[204] Lines should be no longer that 160 chars
php/map.jinja:25
'build_pkgs': ['libssl-dev', 'libcurl4-openssl-dev', 'pkg-config', 'libsslcommon2-dev', 'gcc', 'make', 'autoconf', 'libc-dev', 'pkg-config'],
[204] Lines should be no longer that 160 chars
php/map.jinja:191
'disable_functions': ['pcntl_alarm','pcntl_fork','pcntl_waitpid','pcntl_wait','pcntl_wifexited','pcntl_wifstopped','pcntl_wifsignaled',
[204] Lines should be no longer that 160 chars
php/map.jinja:192
'pcntl_wexitstatus','pcntl_wtermsig','pcntl_wstopsig','pcntl_signal','pcntl_signal_dispatch','pcntl_get_last_error','pcntl_strerror',
[204] Lines should be no longer that 160 chars
php/map.jinja:520
'disable_functions': ['pcntl_alarm','pcntl_fork','pcntl_waitpid','pcntl_wait','pcntl_wifexited','pcntl_wifstopped','pcntl_wifsignaled',
[204] Lines should be no longer that 160 chars
php/map.jinja:521
'pcntl_wexitstatus','pcntl_wtermsig','pcntl_wstopsig','pcntl_signal','pcntl_signal_dispatch','pcntl_get_last_error','pcntl_strerror',
[204] Lines should be no longer that 160 chars
php/map.jinja:896
'disable_functions': ['pcntl_alarm','pcntl_fork','pcntl_waitpid','pcntl_wait','pcntl_wifexited','pcntl_wifstopped','pcntl_wifsignaled',
[204] Lines should be no longer that 160 chars
php/map.jinja:897
'pcntl_wexitstatus','pcntl_wtermsig','pcntl_wstopsig','pcntl_signal','pcntl_signal_dispatch','pcntl_get_last_error','pcntl_strerror',
[204] Lines should be no longer that 160 chars
php/map.jinja:1270
'disable_functions': ['pcntl_alarm','pcntl_fork','pcntl_waitpid','pcntl_wait','pcntl_wifexited','pcntl_wifstopped','pcntl_wifsignaled',
[204] Lines should be no longer that 160 chars
php/map.jinja:1271
'pcntl_wexitstatus','pcntl_wtermsig','pcntl_wstopsig','pcntl_signal','pcntl_signal_dispatch','pcntl_get_last_error','pcntl_strerror',
[204] Lines should be no longer that 160 chars
php/map.jinja:1644
'disable_functions': ['pcntl_alarm','pcntl_fork','pcntl_waitpid','pcntl_wait','pcntl_wifexited','pcntl_wifstopped','pcntl_wifsignaled',
[204] Lines should be no longer that 160 chars
php/map.jinja:1645
'pcntl_wexitstatus','pcntl_wtermsig','pcntl_wstopsig','pcntl_signal','pcntl_signal_dispatch','pcntl_get_last_error','pcntl_strerror',
[204] Lines should be no longer that 160 chars
php/map.jinja:2035
'disable_functions': ['pcntl_alarm','pcntl_fork','pcntl_waitpid','pcntl_wait','pcntl_wifexited','pcntl_wifstopped','pcntl_wifsignaled',
[204] Lines should be no longer that 160 chars
php/map.jinja:2036
'pcntl_wexitstatus','pcntl_wtermsig','pcntl_wstopsig','pcntl_signal','pcntl_signal_dispatch','pcntl_get_last_error','pcntl_strerror',
[204] Lines should be no longer that 160 chars
php/map.jinja:2206
'build_pkgs': ['libssl-dev', 'libcurl4-openssl-dev', 'pkg-config', 'libsslcommon2-dev', 'gcc', 'make', 'autoconf', 'libc-dev', 'pkg-config'],
[204] Lines should be no longer that 160 chars
php/map.jinja:2375
'disable_functions': ['pcntl_alarm','pcntl_fork','pcntl_waitpid','pcntl_wait','pcntl_wifexited','pcntl_wifstopped','pcntl_wifsignaled',
[204] Lines should be no longer that 160 chars
php/map.jinja:2376
'pcntl_wexitstatus','pcntl_wtermsig','pcntl_wstopsig','pcntl_signal','pcntl_signal_dispatch','pcntl_get_last_error','pcntl_strerror',
```
* Initial commit for new branch
* Quick change to base test files
* Updated map.jinja, added `php` dependency for all subformulas
* Fixing mongo module and map.jinja needed OpenSSL dev libraries
* Should be final changes needed for Mongo module
* Updating Suhosin package since many distros don't have package in their
repos anymore
* Generalizing suhosin module, and updating pillar.example for new PPA
* Adding addtional logic for RedHat based families to Suhosin
* Initial commit of NG refactored map.jinja file
* Deleting FFMpeg state file since the module is quite old, and has been
replaced by using a Composer library. See
https://github.com/PHP-FFMpeg/PHP-FFMpeg for details
* Updating NG formulas for new definitions
* Removing 'twig' as a state since it can be installed via Composer
* Changes to installed.jinja to set correct PHP path based on version
* NG Composer and NG Suhosin changes
* Version bump and deleting README for deleted states
* Finished refactor of NG map.jinja file
* Adding trailing commas (forgot them earler)
* Adding changes list, and modifying map file for missing definitions when
using Ubuntu 16.04 and NOT using a PPA
* Changes needed after performing testing on RHEL 7
* Changes needed for Ubuntu Trusty without using PPA
* Removing testing files; keep on local
* Map changes needed after testing Debian Jessie
* Changed needed for Debian Wheezy
* Adding more pkgs for Arch Linux support
* More ArchLinux support
* Stupid tabs
* Removing extra line breaks, and using the general "use_external_repo" in
the future if DotDeb (Debian) or Webtactic (RedHat)
* Accoutning for Precise `phpenmod` and others
This allows composer installs to function even if the installer checksum
changes, and doesn't force us to update the formula whenever their
installer changes.
We can do this now as composer upstream provides the checksum on
https://composer.github.io/installer.sig since 2016-04-28.
The json features of php have been moved to a separate package in the following distributions:
- Debian >= 8 (jessie)
- Ubuntu >= 13.04
Changes:
- Added json.sls
- Updated map.jinja
- Updated README.md
