rpm/Modules
SHA256
1
0
Fork 0
forked from pool/Modules
Code Pull Requests Activity

Accepting request 91189 from systemsmanagement

Browse Source 
updated version
- move /usr/Modules to /usr/share/Modules for FHS 2.2

- update to 3.2.8a
  * switched to 3.2 release
  * lots of changes and bugfixes
  * see NEWS for details

OBS-URL: https://build.opensuse.org/request/show/91189
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Modules?expand=0&rev=10
This commit is contained in:
Stephan Kulow 2011-11-17 10:04:50 +00:00 committed by Git OBS Bridge
parent 8455a82c51
commit 4c98e88aa7
7 changed files with 80 additions and 469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Modules.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue Oct 18 12:56:41 UTC 2011 - kkaempf@suse.com
- move /usr/Modules to /usr/share/Modules for FHS 2.2
-------------------------------------------------------------------
Tue Oct 18 09:44:17 UTC 2011 - kkaempf@suse.com
- update to 3.2.8a
* switched to 3.2 release
* lots of changes and bugfixes
* see NEWS for details
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 25 21:33:43 CET 2006 - mls@suse.de Wed Jan 25 21:33:43 CET 2006 - mls@suse.de

67
Modules.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package Modules (Version 3.1.6) # spec file for package Modules
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -19,18 +19,18 @@
Name: Modules Name: Modules
BuildRequires: tcl-devel xorg-x11-devel BuildRequires: tcl-devel
# xorg-x11-devel
Url: http://modules.sourceforge.net/ Url: http://modules.sourceforge.net/
Version: 3.1.6 Version: 3.2.8
Release: 216 Release: 216
Summary: Environment Modules Summary: Environment Modules
License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later
Group: System/Management Group: System/Management
Requires: tcl Requires: tcl
AutoReqProv: on AutoReqProv: on
Source: modules-%{version}.tar.bz2 Source: modules-%{version}a.tar.bz2
Patch: modules-%{version}.dif Patch: modules-%{version}.patch
Patch1: modules_tmpfile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: environment-modules Provides: environment-modules
Obsoletes: environment-modules Obsoletes: environment-modules
@ -58,12 +58,11 @@ Authors:
%prep %prep
%setup -q -n modules-%{version} %setup -q -n modules-%{version}
%patch %patch -p1
%patch1 -p1
%build %build
#autoreconf --force --install aclocal --force -I config
autoconf autoreconf --force --install
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure \ CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure \
--prefix=/usr \ --prefix=/usr \
--with-version-path=/usr/share/modules \ --with-version-path=/usr/share/modules \
@ -71,60 +70,36 @@ CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure \
--mandir=%{_mandir} \ --mandir=%{_mandir} \
--with-etc-path=/etc \ --with-etc-path=/etc \
--with-skel-path=/etc/skel \ --with-skel-path=/etc/skel \
--with-tcl-libraries=/usr \ --with-tcl=%{_libdir} \
--without-x --without-x
make make
%install %install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/usr/bin
install -d $RPM_BUILD_ROOT/usr/share/modules install -d $RPM_BUILD_ROOT/usr/share/modules
install -d $RPM_BUILD_ROOT/etc/profile.d 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/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 install -m 644 etc/global/csh.modules $RPM_BUILD_ROOT/etc/profile.d/modules.csh
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
rm $RPM_BUILD_ROOT/usr/bin/mkroot install -d $RPM_BUILD_ROOT/usr/bin
pushd $RPM_BUILD_ROOT/usr/bin
ln -s ../share/Modules/%{version}/bin/add.modules .
ln -s ../share/Modules/%{version}/bin/mkroot .
ln -s ../share/Modules/%{version}/bin/modulecmd .
popd
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc xref/* ChangeLog LICENSE.GPL PROBLEMS README TODO doc/Modules-Paper.doc %doc ChangeLog LICENSE.GPL NEWS README TODO
/usr/bin/modulecmd %dir %{_prefix}/share/Modules
%{_prefix}/share/Modules/*
%dir /usr/share/modules %dir /usr/share/modules
/usr/share/modules/* /usr/share/modules/*
/usr/bin/add.modules %{_bindir}/*
/etc/profile.d/modules.* /etc/profile.d/modules.*
%doc %{_mandir}/man4/* %doc %{_mandir}/man4/*
%doc %{_mandir}/man1/* %doc %{_mandir}/man1/*
%changelog %changelog
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Fri Jan 20 2006 mrueckert@suse.de
- Remove temporary files if they are no longer used.
(#73973,#144398)
* Tue Jan 17 2006 mrueckert@suse.de
- fix version path so modules find its configs again
* Mon Sep 13 2004 nashif@suse.de
- Fixed trap call in profile.d script (#45056)
* Thu Sep 02 2004 nashif@suse.de
- #43781: Fixed segfault, verify tmp file was created.
* Sat Aug 14 2004 nashif@suse.de
- Renamed package
- Fixed mkstemp (#43781)
* Sat Apr 24 2004 nashif@suse.de
- Added -fno-strict-aliasing to CFLAGS
* Sat Jan 10 2004 adrian@suse.de
- use x-devel-packages
* Sat May 17 2003 nashif@suse.de
- Fixed file list in spec file
* Tue Aug 06 2002 nashif@suse.de
- fixed sourcing of global configuration file
* Mon Feb 11 2002 nashif@suse.de
- new version: 3.1.6
* Wed Jun 06 2001 nashif@suse.de
- Fixed configure.in
* Mon Feb 19 2001 nashif@suse.de
- Initial Release (Version 3.1.1)

403
modules-3.1.6.dif
View File

@ -1,403 +0,0 @@
--- Makefile.in
+++ Makefile.in
@@ -37,17 +37,17 @@
LIBS = -ltcl@TCL_VERSION@ @TCLX_LIBS@ @X11_LIBS@ @X_EXTRA_LIBS@ @LIBS@
# Standard definition (a'la GNU)
-prefix = @prefix@
+prefix = $(DESTDIR)@prefix@
exec_prefix = @exec_prefix@
-man_prefix = @prefix@
+man_prefix = $(DESTDIR)@prefix@
CFLAGS = @CFLAGS@ -DINSTPATH=\"$(prefix)\"
LDFLAGS = @LDFLAGS@
# Directory in which to install binaries, module files, and init files
bindir = $(exec_prefix)/bin
-filedir = $(prefix)/modulefiles
-initdir = $(prefix)/init
+filedir = $(prefix)/share/modules/modulefiles
+initdir = $(prefix)/share/modules/init
SHELL = /bin/sh
--- config.h.in
+++ config.h.in
@@ -210,6 +210,9 @@
/* Define if you have the syslog function. */
#undef HAVE_SYSLOG
+/* Define if you have the mkstemp function. */
+#undef HAVE_MKSTEMP
+
/* Define if you have the tempnam function. */
#undef HAVE_TEMPNAM
--- configure.in
+++ configure.in
@@ -79,7 +79,7 @@
dnl also expand @VERSION@ in path
DEFAULTPATH=default
if test "$prefix" != "NONE" ; then
- DEFAULTPATH=`echo $prefix | sed -e s%@VERSION@%$DEFAULTPATH%g`
+ DEFAULTPATH=/usr/share/modules
BASEPREFIX=`echo $prefix | sed -e s%@VERSION@%%g`
prefix=`echo $prefix | sed -e s%@VERSION@%$VERSION%g`
NODEFAULTPATH=$prefix
@@ -127,7 +127,7 @@
AC_CHECK_LIB(socket, socket)
AC_CHECK_LIB(nsl, t_accept)
AC_PATH_XTRA
-AC_HAVE_FUNCS(strdup strtok uname gethostname getdomainname tempnam tmpnam \
+AC_HAVE_FUNCS(strdup strtok uname gethostname getdomainname mkstemp tempnam tmpnam \
syslog dup2)
AC_PATH_PROG_SEARCH(_CPPSTDIN, cpp, /lib /usr/lib /usr/lang \
/usr/local/lang /usr/ccs/lib, [${CC} -E])
@@ -506,7 +506,7 @@
AC_MAKE_INCLUDE(tclx_includes, TCLX_INC_DIR)
AC_MAKE_LIBRARY(tclx_libraries, TCLX_LIB_DIR)
TCLX_LIBS="-ltclx"
- AC_REQUIRE([AC_PATH_XTRA])
+ dnl AC_REQUIRE([AC_PATH_XTRA])
fi)
dnl
dnl --------------------------------------------------------------
@@ -518,7 +518,7 @@
dnl --with-skel-path
dnl
AC_ARG_WITH(module-path,
- [ --with-module-path=<path> use module path=<path> [/usr/local/Modules/modulefiles]],
+ [ --with-module-path=<path> use module path=<path> [/usr/share/modules/modulefiles]],
MODULEPATH="$withval"
AC_MSG_RESULT([MODULEPATH = $with_module_path])
AC_DEFINE_UNQUOTED(MODULEPATH, "$withval")
--- doc/Makefile.in
+++ doc/Makefile.in
@@ -25,8 +25,8 @@
# Directory in which to install man pages
mandir = @mandir@
-man1dir = $(mandir)/man1
-man4dir = $(mandir)/man4
+man1dir = $(DESTDIR)/$(mandir)/man1
+man4dir = $(DESTDIR)/$(mandir)/man4
SHELL = /bin/sh
--- etc/Makefile.in
+++ etc/Makefile.in
@@ -17,14 +17,14 @@
INSTALL_PROGRAM = $(INSTALL) -m 0755
INSTALL_DATA = $(INSTALL) -m 0644
-# Standard definition (a'la GNU)
-prefix = @prefix@
+
+prefix = $(DESTDIR)/@prefix@
exec_prefix = @exec_prefix@
-man_prefix = @prefix@
+man_prefix = $(DESTDIR)/@mandir@
# Directory in which to install scripts
bindir = $(exec_prefix)/bin
-filedir = $(prefix)/modulefiles
+filedir = $(prefix)/share/modules/modulefiles
SHELL = /bin/sh
--- etc/global/profile.modules.in
+++ etc/global/profile.modules.in
@@ -11,4 +11,4 @@
*) . @DEFAULTPATH@/init/sh ;; # default for scripts
esac
-trap 1 2 3
+trap - 1 2 3
--- ext/Makefile.in
+++ ext/Makefile.in
@@ -18,13 +18,13 @@
INSTALL_DATA = $(INSTALL) -m 0644
# Standard definition (a'la GNU)
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-man_prefix = @prefix@
+prefix = $(DESTDIR)/@prefix@
+exec_prefix = $(DESTDIR)/@exec_prefix@
+man_prefix = $(DESTDIR)/@mandir@
# Directory in which to install scripts
bindir = $(exec_prefix)/bin
-filedir = $(prefix)/modulefiles
+filedir = $(prefix)/share/modules/modulefiles
SHELL = /bin/sh
--- init/.modulespath.in
+++ init/.modulespath.in
@@ -14,6 +14,6 @@
#
@VERSIONPATH@ # location of version files
-@BASEPREFIX@$MODULE_VERSION/modulefiles # Module pkg modulefiles
+#@BASEPREFIX@$MODULE_VERSION/modulefiles # Module pkg modulefiles
@MODULEPATH@ # General module files
# @prefix@/your_contribs # Edit for your requirements
--- init/Makefile.in
+++ init/Makefile.in
@@ -18,14 +18,14 @@
INSTALL_DATA = $(INSTALL) -m 0644
# Standard definition (a'la GNU)
-prefix = @prefix@
+prefix = $(DESTDIR)/@prefix@
exec_prefix = @exec_prefix@
-man_prefix = @prefix@
+man_prefix = $(DESTDIR)/@mandir@
# Directory in which to install binaries, module files, and init files
bindir = $(exec_prefix)/bin
-filedir = $(prefix)/modulefiles
-initdir = $(prefix)/init
+filedir = $(prefix)/share/modules/modulefiles
+initdir = $(prefix)/share/modules/init
SHELL = /bin/sh
--- init/bash.in
+++ init/bash.in
@@ -8,9 +8,9 @@
fi
export MODULE_VERSION_STACK
-module() { eval `@BASEPREFIX@$MODULE_VERSION/bin/modulecmd bash $*`; }
+module() { eval `@BASEPREFIX@/bin/modulecmd bash $*`; }
-MODULESHOME=@prefix@
+MODULESHOME=@prefix@/share/modules
export MODULESHOME
if [ "${LOADEDMODULES:-}" = "" ]; then
@@ -19,6 +19,6 @@
fi
if [ "${MODULEPATH:-}" = "" ]; then
- MODULEPATH=`sed 's/#.*$//' ${MODULESHOME}/init/.modulespath | awk 'NF==1{printf("%s:",$1)}'`
+ MODULEPATH=`sed 's/#.*$//' ${MODULESHOME}/init/.modulespath | awk 'NF==1{printf("%s:",$1)}' | sed 's/:$//'`
export MODULEPATH
fi
--- init/csh.in
+++ init/csh.in
@@ -9,7 +9,7 @@
setenv MODULE_VERSION "@VERSION@"
setenv MODULE_VERSION_STACK "@VERSION@"
endif
-set exec_prefix='@BASEPREFIX@$MODULE_VERSION'
+set exec_prefix='@BASEPREFIX@'
if ( $?histchars ) then
set _histchars = $histchars
@@ -27,10 +27,10 @@
endif
unset exec_prefix
-setenv MODULESHOME @prefix@
+setenv MODULESHOME @prefix@/share/modules
if (! $?MODULEPATH ) then
- setenv MODULEPATH `sed 's/#.*$//' ${MODULESHOME}/init/.modulespath | awk 'NF==1{printf("%s:",$1)}'`
+ setenv MODULEPATH `sed 's/#.*$//' ${MODULESHOME}/init/.modulespath | awk 'NF==1{printf("%s:",$1)}' | sed 's/:$//'`
endif
if (! $?LOADEDMODULES ) then
--- init/ksh.in
+++ init/ksh.in
@@ -8,9 +8,9 @@
fi
export MODULE_VERSION_STACK
-module() { eval `@BASEPREFIX@$MODULE_VERSION/bin/modulecmd ksh $*`; }
+module() { eval `@BASEPREFIX@/bin/modulecmd ksh $*`; }
-MODULESHOME=@prefix@
+MODULESHOME=@prefix@/share/modules
export MODULESHOME
if [ "${LOADEDMODULES:-}" = "" ]; then
@@ -19,6 +19,6 @@
fi
if [ "${MODULEPATH:-}" = "" ]; then
- MODULEPATH=`sed 's/#.*$//' ${MODULESHOME}/init/.modulespath | awk 'NF==1{printf("%s:",$1)}'`
+ MODULEPATH=`sed 's/#.*$//' ${MODULESHOME}/init/.modulespath | awk 'NF==1{printf("%s:",$1)}' | sed 's/:$//'`
export MODULEPATH
fi
--- init/perl.in
+++ init/perl.in
@@ -8,15 +8,15 @@
sub module {
local ($exec_prefix);
- $exec_prefix = "@BASEPREFIX@".$ENV{MODULE_VERSION};
+ $exec_prefix = "@BASEPREFIX@";
eval `$exec_prefix/bin/modulecmd perl @_`;
}
-$ENV{MODULESHOME} = "@prefix@";
+$ENV{MODULESHOME} = "@prefix@/share/modules";
if (! defined $ENV{MODULEPATH} ) {
- $ENV{MODULEPATH} = `sed 's/#.*$//' ${MODULESHOME}/init/.modulespath | awk 'NF==1{printf("%s:",$1)}'`
+ $ENV{MODULEPATH} = `sed 's/#.*$//' ${MODULESHOME}/init/.modulespath | awk 'NF==1{printf("%s:",$1)}' | sed 's/:$//'`
}
if (! defined $ENV{LOADEDMODULES} ) {
--- init/python.in
+++ init/python.in
@@ -6,7 +6,7 @@
else:
os.environ['MODULE_VERSION_STACK'] = os.environ['MODULE_VERSION']
-os.environ['MODULESHOME'] = '@prefix@'
+os.environ['MODULESHOME'] = '@prefix@/share/modules'
if not os.environ.has_key('MODULEPATH'):
os.environ['MODULEPATH'] = os.popen("""sed 's/#.*$//' ${MODULESHOME}/init/.modulespath | awk 'NF==1{printf("%s:",$1)}'""").readline()
--- init/sh.in
+++ init/sh.in
@@ -8,9 +8,9 @@
fi
export MODULE_VERSION_STACK
-module() { eval `@BASEPREFIX@$MODULE_VERSION/bin/modulecmd sh $*`; }
+module() { eval `@BASEPREFIX@/bin/modulecmd sh $*`; }
-MODULESHOME=@prefix@
+MODULESHOME=@prefix@/share/modules
export MODULESHOME
if [ "${LOADEDMODULES:-}" = "" ]; then
@@ -19,6 +19,6 @@
fi
if [ "${MODULEPATH:-}" = "" ]; then
- MODULEPATH=`sed 's/#.*$//' ${MODULESHOME}/init/.modulespath | awk 'NF==1{printf("%s:",$1)}'`
+ MODULEPATH=`sed 's/#.*$//' ${MODULESHOME}/init/.modulespath | awk 'NF==1{printf("%s:",$1)}' | sed 's/:$//'`
export MODULEPATH
fi
--- init/tcsh.in
+++ init/tcsh.in
@@ -5,7 +5,7 @@
setenv MODULE_VERSION "@VERSION@"
setenv MODULE_VERSION_STACK "@VERSION@"
endif
-set exec_prefix='@BASEPREFIX@$MODULE_VERSION'
+set exec_prefix='@BASEPREFIX@'
if ( $?histchars ) then
set histchar = `echo $histchars | cut -c1`
@@ -19,10 +19,10 @@
endif
unset exec_prefix
-setenv MODULESHOME @prefix@
+setenv MODULESHOME @prefix@/share/modules
if (! $?MODULEPATH ) then
- setenv MODULEPATH `sed 's/#.*$//' ${MODULESHOME}/init/.modulespath | awk 'NF==1{printf("%s:",$1)}'`
+ setenv MODULEPATH `sed 's/#.*$//' ${MODULESHOME}/init/.modulespath | awk 'NF==1{printf("%s:",$1)}' | sed 's/:$//'`
endif
if (! $?LOADEDMODULES ) then
--- init/zsh.in
+++ init/zsh.in
@@ -8,9 +8,9 @@
fi
export MODULE_VERSION_STACK
-module() { eval `@BASEPREFIX@$MODULE_VERSION/bin/modulecmd zsh $*`; }
+module() { eval `@BASEPREFIX@/bin/modulecmd zsh $*`; }
-MODULESHOME=@prefix@
+MODULESHOME=@prefix@/share/modules
export MODULESHOME
if [ "${LOADEDMODULES:-}" = "" ]; then
@@ -19,6 +19,6 @@
fi
if [ "${MODULEPATH:-}" = "" ]; then
- MODULEPATH=`sed 's/#.*$//' ${MODULESHOME}/init/.modulespath | awk 'NF==1{printf("%s:",$1)}'`
+ MODULEPATH=`sed 's/#.*$//' ${MODULESHOME}/init/.modulespath | awk 'NF==1{printf("%s:",$1)}' | sed 's/:$//'`
export MODULEPATH
fi
--- modulefiles/Makefile.in
+++ modulefiles/Makefile.in
@@ -17,13 +17,13 @@
INSTALL_DATA = $(INSTALL) -m 0644
# Standard definition (a'la GNU)
-prefix = @prefix@
+prefix = $(DESTDIR)@prefix@
exec_prefix = @exec_prefix@
-man_prefix = @prefix@
+man_prefix = $(DESTDIR)@mandir@
-# Directory in which to module files
-filedir = $(prefix)/modulefiles
-versdir = @VERSIONPATH@
+
+filedir = $(prefix)/share/modules/modulefiles
+versdir = $(prefix)/share/modules
SHELL = /bin/sh
--- utility.c
+++ utility.c
@@ -741,6 +741,7 @@
char *val = NULL, /** Stored value (is a pointer!) **/
*key; /** Tcl hash key **/
int i; /** Loop counter **/
+ int fd;
char *sourceCommand; /** Command used to source the alias **/
/**
@@ -760,6 +761,12 @@
** The default for aliasfile, if no shell sourcing is used, is stdout.
**/
+#ifdef HAVE_MKSTEMP
+ char aliasfilename[] = "/tmp/M_od_.XXXXXX";
+ if (fd = mkstemp(aliasfilename) < 0)
+ if( OK != ErrorLogger( ERR_OPEN, LOC, aliasfilename, "append", NULL))
+ return( TCL_ERROR); /** -------- EXIT (FAILURE) -------> **/
+#else
#ifdef HAVE_TEMPNAM
char* aliasfilename = (char *)tempnam(NULL, "M_od_");
#else
@@ -770,6 +777,7 @@
char* aliasfilename = "M_od_temp";
#endif /* not HAVE_TMPNAM */
#endif /* not HAVE_TEMPNAM */
+#endif /* not HAVE_MKSTEMP */
#endif /* not EVAL_ALIAS */
table[0] = aliasSetHashTable;
@@ -803,9 +811,15 @@
** Open the file ...
**/
+#ifdef HAVE_MKSTEMP
+ if( !( aliasfile = fdopen(fd, "w+"))) {
+ if( OK != ErrorLogger( ERR_OPEN, LOC, aliasfilename, "append", NULL))
+ return( TCL_ERROR); /** -------- EXIT (FAILURE) -------> **/
+#else
if( !( aliasfile = fopen((char *) aliasfilename, "w+"))) {
if( OK != ErrorLogger( ERR_OPEN, LOC, aliasfilename, "append", NULL))
return( TCL_ERROR); /** -------- EXIT (FAILURE) -------> **/
+#endif
} else {

3
modules-3.1.6.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:71480a98fce28e7604c63e5dbd7db1848a052e1342f4c8ab2d2d39b1842efbcb
size 337554

42
modules-3.2.8.patch Normal file
View File

@ -0,0 +1,42 @@
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 @@
fi
if test "$prefix" != "NONE" ; then
if test "$WANTS_VERSIONING" -eq 1 ; then
- DEFAULTPATH=$prefix/Modules/default
- NODEFAULTPATH=$prefix/Modules/$VERSION
+ DEFAULTPATH=$prefix/share/Modules/default
+ NODEFAULTPATH=$prefix/share/Modules/$VERSION
BASEPREFIX=$prefix
- prefix=$BASEPREFIX/Modules/$VERSION
+ prefix=$BASEPREFIX/share/Modules/$VERSION
export prefix
else
DEFAULTPATH=$prefix/Modules
@@ -125,10 +125,10 @@
PREFIX=$prefix
else
if test "$WANTS_VERSIONING" -eq 1 ; then
- DEFAULTPATH=$ac_default_prefix/Modules/default
- NODEFAULTPATH=$ac_default_prefix/Modules/$VERSION
+ DEFAULTPATH=$ac_default_prefix/share/Modules/default
+ NODEFAULTPATH=$ac_default_prefix/share/Modules/$VERSION
BASEPREFIX=$ac_default_prefix
- ac_default_prefix=$BASEPREFIX/Modules/$VERSION
+ ac_default_prefix=$BASEPREFIX/share/Modules/$VERSION
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 ***************************************************** **

3
modules-3.2.8a.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9c47d18aa29b94c5964a79e0dc06facb928911355ab904aa27955cb39ec4173f
size 336840

16
modules_tmpfile.patch
View File

@ -1,16 +0,0 @@
diff -Naru modules-3.1.6-orig/utility.c modules-3.1.6/utility.c
--- modules-3.1.6-orig/utility.c 2005-03-18 16:33:39.069600000 -0600
+++ modules-3.1.6/utility.c 2005-03-18 19:21:19.558109353 -0600
@@ -835,6 +835,12 @@
fprintf( stdout, "/bin/rm -f %s%c", aliasfilename, cmd_separator);
} /** if( fopen) **/
} /** if( alias to set) **/
+#ifdef HAVE_MKSTEMP
+ else {
+ /* In this case, we don't need the temp file we created earlier. */
+ unlink(aliasfilename);
+ }
+#endif
free( aliasfilename);