diff --git a/Modules.changes b/Modules.changes index b7bc493..c7021e4 100644 --- a/Modules.changes +++ b/Modules.changes @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Wed Aug 29 20:11:14 UTC 2012 - alinm.elena@gmail.com +- update to 3.2.9c + * Fix the coexistence of load/remove flags (Martin Siegert) + * Fixed an overlapping string copy (Wilson Snyder & Orion Poplawski) + * Isolated calls to the new interpreter and get & set env.vars. + * Crucial bug fix of same by (Orion Poplawski). + * Optionally use Tcl memory check routines for malloc/realloc. + * Fixed the "module purge" memory corruption (Poor Yorick) + * Added support for Ruby (Tammo Tjarks) +- replace defaut in the profile files with the proper version +- make module files from /etc %config +------------------------------------------------------------------- Thu Dec 1 11:19:55 UTC 2011 - coolo@suse.com - add automake as buildrequire to avoid implicit dependency diff --git a/Modules.spec b/Modules.spec index 9757b57..88d7951 100644 --- a/Modules.spec +++ b/Modules.spec @@ -1,7 +1,7 @@ # # spec file for package Modules # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,19 +15,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: Modules BuildRequires: automake BuildRequires: tcl-devel # xorg-x11-devel Url: http://modules.sourceforge.net/ -Version: 3.2.8 +Version: 3.2.9 Release: 0 Summary: Environment Modules License: BSD-3-Clause ; GPL-2.0+ ; LGPL-2.1+ Group: System/Management -Requires: tcl -Source: modules-%{version}a.tar.bz2 -Patch: modules-%{version}.patch +Requires: tcl +Source: modules-%{version}c.tar.bz2 +# PATCH-FIX-OPENSUSE share.patch +Patch0: share.patch +# PATCH-FIX-UPSTREAM return.patch +Patch1: return.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: environment-modules Obsoletes: environment-modules @@ -55,7 +59,8 @@ Authors: %prep %setup -q -n modules-%{version} -%patch -p1 +%patch0 -p1 +%patch1 -p1 %build aclocal --force -I config @@ -76,6 +81,9 @@ install -d $RPM_BUILD_ROOT/usr/share/modules install -d $RPM_BUILD_ROOT/etc/profile.d install -m 644 etc/global/profile.modules $RPM_BUILD_ROOT/etc/profile.d/modules.sh install -m 644 etc/global/csh.modules $RPM_BUILD_ROOT/etc/profile.d/modules.csh +sed -i "s;/default/;/%{version}/;g" $RPM_BUILD_ROOT/etc/profile.d/modules.sh +sed -i "s;/default/;/%{version}/;g" $RPM_BUILD_ROOT/etc/profile.d/modules.csh + make DESTDIR=$RPM_BUILD_ROOT install install -d $RPM_BUILD_ROOT/usr/bin pushd $RPM_BUILD_ROOT/usr/bin @@ -95,7 +103,7 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/share/modules /usr/share/modules/* %{_bindir}/* -/etc/profile.d/modules.* +%config /etc/profile.d/modules.* %doc %{_mandir}/man4/* %doc %{_mandir}/man1/* diff --git a/modules-3.2.8a.tar.bz2 b/modules-3.2.8a.tar.bz2 deleted file mode 100644 index 7e127d3..0000000 --- a/modules-3.2.8a.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c47d18aa29b94c5964a79e0dc06facb928911355ab904aa27955cb39ec4173f -size 336840 diff --git a/modules-3.2.9c.tar.bz2 b/modules-3.2.9c.tar.bz2 new file mode 100644 index 0000000..4d0d14e --- /dev/null +++ b/modules-3.2.9c.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:142cfbf71e33ac8a4506d71dd650d1b613999538b5b0bcb7f24167e3600e6502 +size 359384 diff --git a/return.patch b/return.patch new file mode 100644 index 0000000..2fc348b --- /dev/null +++ b/return.patch @@ -0,0 +1,10 @@ +--- a/ModuleCmd_Avail.c.old 2012-08-29 01:06:16.176859774 +0100 ++++ b/ModuleCmd_Avail.c 2012-08-29 01:06:52.540527924 +0100 +@@ -680,6 +680,7 @@ static int check_cache( char *dir) + + static int test_version_dir( struct dirent *dp) + { ++ return 0; + } + /*++++ + ** ** Function-Header ***************************************************** ** diff --git a/modules-3.2.8.patch b/share.patch similarity index 59% rename from modules-3.2.8.patch rename to share.patch index 340fcd8..73a1b5d 100644 --- a/modules-3.2.8.patch +++ b/share.patch @@ -1,7 +1,6 @@ -diff -wruN -x '*~' ../orig-modules-3.2.8/configure.ac ./configure.ac ---- ../orig-modules-3.2.8/configure.ac 2010-10-04 17:59:50.000000000 +0200 -+++ ./configure.ac 2011-10-18 14:50:35.000000000 +0200 -@@ -110,10 +110,10 @@ +--- a/configure.ac.old 2012-08-29 01:08:43.401494114 +0100 ++++ b/configure.ac 2012-08-29 01:14:18.310729106 +0100 +@@ -110,10 +110,10 @@ must disable with --disable-versioning ] fi if test "$prefix" != "NONE" ; then if test "$WANTS_VERSIONING" -eq 1 ; then @@ -15,7 +14,7 @@ diff -wruN -x '*~' ../orig-modules-3.2.8/configure.ac ./configure.ac export prefix else DEFAULTPATH=$prefix/Modules -@@ -125,10 +125,10 @@ +@@ -125,10 +125,10 @@ if test "$prefix" != "NONE" ; then PREFIX=$prefix else if test "$WANTS_VERSIONING" -eq 1 ; then @@ -29,14 +28,3 @@ diff -wruN -x '*~' ../orig-modules-3.2.8/configure.ac ./configure.ac export ac_default_prefix else DEFAULTPATH=$ac_default_prefix/Modules -diff -wruN -x '*~' ../orig-modules-3.2.8/ModuleCmd_Avail.c ./ModuleCmd_Avail.c ---- ../orig-modules-3.2.8/ModuleCmd_Avail.c 2010-07-27 21:09:05.000000000 +0200 -+++ ./ModuleCmd_Avail.c 2011-10-18 12:21:15.000000000 +0200 -@@ -680,6 +680,7 @@ - - static int test_version_dir( struct dirent *dp) - { -+ return 0; - } - /*++++ - ** ** Function-Header ***************************************************** **