diff --git a/.gitignore b/.gitignore index 106f807..a96273a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ modules-3.2.8.tar.bz2 /modules-3.2.9a.tar.bz2 /modules-3.2.9b.tar.bz2 /modules-3.2.9c.tar.bz2 +/modules-3.2.10.tar.bz2 diff --git a/environment-modules-regex.patch b/environment-modules-regex.patch deleted file mode 100644 index af2c9aa..0000000 --- a/environment-modules-regex.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -ur modules-3.2.9.orig/cmdXResource.c modules-3.2.9/cmdXResource.c ---- modules-3.2.9.orig/cmdXResource.c 2010-11-11 19:23:18.000000000 +0100 -+++ modules-3.2.9/cmdXResource.c 2012-08-24 13:49:48.717499074 +0200 -@@ -446,7 +446,6 @@ - ** is a constant regexp! - **/ - -- if( !res_exp) - res_exp = Tcl_RegExpCompile(interp, - "^[ \t]*([^ \t]*)[ \t]*:[ \t]*(.*)[ \t]*$"); - -diff -ur modules-3.2.9.orig/utility.c modules-3.2.9/utility.c ---- modules-3.2.9.orig/utility.c 2011-11-28 22:27:13.000000000 +0100 -+++ modules-3.2.9/utility.c 2012-08-24 13:50:13.455735765 +0200 -@@ -3061,16 +3061,13 @@ - tstr = (const char *) TCL_RESULT(interp); - - /* compile regular expression the first time through */ -- if (!exit__expPtr) -- exit__expPtr = Tcl_RegExpCompile(interp, "^EXIT ([0-9]*)"); -+ exit__expPtr = Tcl_RegExpCompile(interp, "^EXIT ([0-9]*)"); - - /* result = "invoked \"break\" outside of a loop" */ -- if (!break_expPtr) -- break_expPtr = Tcl_RegExpCompile(interp, ".*\"break\".*"); -+ break_expPtr = Tcl_RegExpCompile(interp, ".*\"break\".*"); - - /* result = "invoked \"continue\" outside of a loop" */ -- if (!continue_expPtr) -- continue_expPtr = Tcl_RegExpCompile(interp, ".*\"continue\".*"); -+ continue_expPtr = Tcl_RegExpCompile(interp, ".*\"continue\".*"); - - /* intercept any "EXIT N" first */ - if(tstr && *tstr && 0 < Tcl_RegExpExec(interp, exit__expPtr, diff --git a/environment-modules.spec b/environment-modules.spec index f8155f0..e51669c 100644 --- a/environment-modules.spec +++ b/environment-modules.spec @@ -1,6 +1,6 @@ Name: environment-modules -Version: 3.2.9c -Release: 5%{?dist} +Version: 3.2.10 +Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment Group: System Environment/Base @@ -11,9 +11,6 @@ Source1: modules.sh Source2: createmodule.sh Source3: createmodule.py Patch0: environment-modules-3.2.7-bindir.patch -# Patch to fix segfault in module unload due to Tcl RegExp handling -# https://bugzilla.redhat.com/show_bug.cgi?id=834580 -Patch1: environment-modules-regex.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tcl-devel, tclx-devel, libX11-devel @@ -48,9 +45,8 @@ have access to the module alias. %prep -%setup -q -n modules-3.2.9 +%setup -q -n modules-%{version} %patch0 -p1 -b .bindir -%patch1 -p1 -b .regex %build @@ -98,6 +94,10 @@ make test %changelog +* Fri Dec 21 2012 Orion Poplawski - 3.2.10-1 +- Update to 3.2.10 +- Drop regex patch + * Wed Oct 31 2012 Orion Poplawski - 3.2.9c-5 - Updated createmodule.sh, added createmodule.py, can handle path prefixes diff --git a/sources b/sources index 0a048f9..440d4c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a15052f88ae9254c9b7f22e664d50544 modules-3.2.9c.tar.bz2 +7db43a0e272574219d68bd2a2683f25f modules-3.2.10.tar.bz2