Update to 4.1.2 (#1562535)

.gitignore

@@ -7,3 +7,4 @@ modules-3.2.8.tar.bz2
 /modules-4.0.0.tar.bz2
 /modules-4.1.0.tar.bz2
 /modules-4.1.1.tar.bz2
+/modules-4.1.2.tar.bz2

0001-init-shield-autoinit-res-from-param-expansion-on-sh.patch

@@ -1,101 +0,0 @@
-From 468f16f9ec477f1501d643675b5d4bea2e344e8b Mon Sep 17 00:00:00 2001
-From: Xavier Delaruelle <xavier.delaruelle@cea.fr>
-Date: Thu, 1 Mar 2018 19:15:44 +0100
-Subject: [PATCH] init: shield autoinit res from param expansion on sh-shells
-
-Quote autoinit result for eval interpretation on SH-kind shells to
-avoid parameter expansion to randomly occur on generated code
-depending on file or directory names of current working directory.
-
-Test basic module commands in install testsuite with a
-'something (test)' file existing in current working directory.
-
-Fixes bug reported at [1].
-
-[1] https://bugzilla.redhat.com/show_bug.cgi?id=1549664
-
-Resolves: #1549664
-
----
-
-diff --git a/doc/source/module.rst b/doc/source/module.rst
-index e90313b0..c73ce18b 100644
---- a/doc/source/module.rst
-+++ b/doc/source/module.rst
-@@ -96,7 +96,7 @@ Bourne Shell (sh) (and derivatives) with **autoinit** sub-command:
- 
- .. parsed-literal::
- 
--     eval \`\ |libexecdir|\ /modulecmd.tcl sh autoinit\`
-+     eval "\`\ |libexecdir|\ /modulecmd.tcl sh autoinit\`"
- 
- 
- Modulecmd startup
-diff --git a/init/bash.in b/init/bash.in
-index a926abe1..ce9822b4 100644
---- a/init/bash.in
-+++ b/init/bash.in
-@@ -35,7 +35,7 @@ fi;
- 
- # define module command and surrounding initial environment (default value
- # for MODULESHOME, MODULEPATH, LOADEDMODULES and parse of init/.modulespath)
--eval `${_mlre:-}@TCLSH@ @libexecdir@/modulecmd.tcl bash autoinit`
-+eval "`${_mlre:-}@TCLSH@ @libexecdir@/modulecmd.tcl bash autoinit`"
- 
- # clean temp variables used to setup quarantine
- if [ -n "${_mlIFS+x}" ]; then
-diff --git a/init/ksh.in b/init/ksh.in
-index f7557c70..834b8224 100644
---- a/init/ksh.in
-+++ b/init/ksh.in
-@@ -35,7 +35,7 @@ fi;
- 
- # define module command and surrounding initial environment (default value
- # for MODULESHOME, MODULEPATH, LOADEDMODULES and parse of init/.modulespath)
--eval `${_mlre:-}@TCLSH@ @libexecdir@/modulecmd.tcl ksh autoinit`
-+eval "`${_mlre:-}@TCLSH@ @libexecdir@/modulecmd.tcl ksh autoinit`"
- 
- # clean temp variables used to setup quarantine
- if [ -n "${_mlIFS+x}" ]; then
-diff --git a/init/sh.in b/init/sh.in
-index 3a62f11d..197b865e 100644
---- a/init/sh.in
-+++ b/init/sh.in
-@@ -35,7 +35,7 @@ fi;
- 
- # define module command and surrounding initial environment (default value
- # for MODULESHOME, MODULEPATH, LOADEDMODULES and parse of init/.modulespath)
--eval `${_mlre:-}@TCLSH@ @libexecdir@/modulecmd.tcl sh autoinit`
-+eval "`${_mlre:-}@TCLSH@ @libexecdir@/modulecmd.tcl sh autoinit`"
- 
- # clean temp variables used to setup quarantine
- if [ -n "${_mlIFS+x}" ]; then
-diff --git a/init/zsh.in b/init/zsh.in
-index 1b669126..b2c10ef6 100644
---- a/init/zsh.in
-+++ b/init/zsh.in
-@@ -35,7 +35,7 @@ fi;
- 
- # define module command and surrounding initial environment (default value
- # for MODULESHOME, MODULEPATH, LOADEDMODULES and parse of init/.modulespath)
--eval `${=_mlre:-}@TCLSH@ @libexecdir@/modulecmd.tcl zsh autoinit`
-+eval "`${=_mlre:-}@TCLSH@ @libexecdir@/modulecmd.tcl zsh autoinit`"
- 
- # clean temp variables used to setup quarantine
- if [ -n "${_mlIFS+x}" ]; then
-diff --git a/testsuite/bin/install_test_sh b/testsuite/bin/install_test_sh
-index 890d1ba0..165460a5 100755
---- a/testsuite/bin/install_test_sh
-+++ b/testsuite/bin/install_test_sh
-@@ -82,7 +82,7 @@ fi
- # source module init file if first step of given mode
- if [ "$mode" = 'top' -o "$mode" = 'sub' -o  "$mode" = 'subsub' ]; then
-    if [ $autoinit -eq 0 ]; then
--      eval $($initfile $shname autoinit)
-+      eval "$($initfile $shname autoinit)"
-    else
-       . $initfile
-    fi
--- 
-2.13.6
-

environment-modules.spec

@@ -1,15 +1,14 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:           environment-modules
-Version:        4.1.1
+Version:        4.1.2
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Provides dynamic modification of a user's environment
 
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://modules.sourceforge.net/
 Source0:        http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2
-Patch0:         0001-init-shield-autoinit-res-from-param-expansion-on-sh.patch
 
 BuildRequires:  tcl-devel, tclx-devel, libX11-devel
 BuildRequires:  dejagnu, sed, procps, hostname, man, less
@@ -57,8 +56,6 @@ This package provides Environment Modules compatibility version (3.2).
 %prep
 %setup -q -n modules-%{version}
 
-%patch0 -p1
-
 
 %build
 %configure --prefix=%{_datadir}/Modules \
@@ -178,6 +175,9 @@ fi
 
 
 %changelog
+* Tue Apr  3 2018 Jan Synáček <jsynacek@redhat.com> - 4.1.2-1
+- Update to 4.1.2 (#1562535)
+
 * Tue Mar  6 2018 Jan Synáček <jsynacek@redhat.com> - 4.1.1-2
 - Fix error messages caused by unquoted parameters (#1549664)
 

sources

@@ -1 +1 @@
-SHA512 (modules-4.1.1.tar.bz2) = 5cf253251cea6c911008ecec3fd686aa683e20f0ab60d77811682ab2fdd9135d1fbfb6712f72cc6404e1716f1a09847934812dccad42d36a6594b1f292dbffdc
+SHA512 (modules-4.1.2.tar.bz2) = afccbfef2bb5a9aa8a1c446926ade968f7b61040acd3b976edd2375085edd73d8a8c484b67aedadb8a2fa6d8a3c047dc34730246ba3b8ddc83395d93864c4b25