From 398097230d32e116e64c9e4e1c1526a180219791e4fbeb716c70d4b82f56b4d7 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 15 Jan 2007 22:49:24 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Modules?expand=0&rev=1 --- .gitattributes | 23 +++ Modules.changes | 67 +++++++ Modules.spec | 123 +++++++++++++ modules-3.1.6.dif | 403 ++++++++++++++++++++++++++++++++++++++++++ modules-3.1.6.tar.bz2 | 3 + modules_tmpfile.patch | 16 ++ ready | 0 7 files changed, 635 insertions(+) create mode 100644 .gitattributes create mode 100644 Modules.changes create mode 100644 Modules.spec create mode 100644 modules-3.1.6.dif create mode 100644 modules-3.1.6.tar.bz2 create mode 100644 modules_tmpfile.patch create mode 100644 ready diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/Modules.changes b/Modules.changes new file mode 100644 index 0000000..38f541f --- /dev/null +++ b/Modules.changes @@ -0,0 +1,67 @@ +------------------------------------------------------------------- +Wed Jan 25 21:33:43 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Fri Jan 20 21:45:38 CET 2006 - mrueckert@suse.de + +- Remove temporary files if they are no longer used. + (#73973,#144398) + +------------------------------------------------------------------- +Tue Jan 17 16:08:56 CET 2006 - mrueckert@suse.de + +- fix version path so modules find its configs again + +------------------------------------------------------------------- +Mon Sep 13 19:35:50 CEST 2004 - nashif@suse.de + +- Fixed trap call in profile.d script (#45056) + +------------------------------------------------------------------- +Thu Sep 2 18:15:43 CEST 2004 - nashif@suse.de + +- #43781: Fixed segfault, verify tmp file was created. + +------------------------------------------------------------------- +Sat Aug 14 19:20:51 CEST 2004 - nashif@suse.de + +- Renamed package +- Fixed mkstemp (#43781) + +------------------------------------------------------------------- +Sat Apr 24 20:22:16 CEST 2004 - nashif@suse.de + +- Added -fno-strict-aliasing to CFLAGS + +------------------------------------------------------------------- +Sat Jan 10 18:25:58 CET 2004 - adrian@suse.de + +- use x-devel-packages + +------------------------------------------------------------------- +Sat May 17 17:12:39 CEST 2003 - nashif@suse.de + +- Fixed file list in spec file + +------------------------------------------------------------------- +Tue Aug 6 02:17:43 CEST 2002 - nashif@suse.de + +- fixed sourcing of global configuration file + +------------------------------------------------------------------- +Mon Feb 11 13:39:35 CET 2002 - nashif@suse.de + +- new version: 3.1.6 + +------------------------------------------------------------------- +Wed Jun 6 19:07:27 CEST 2001 - nashif@suse.de + +- Fixed configure.in + +------------------------------------------------------------------- +Mon Feb 19 07:25:27 MET 2001 - nashif@suse.de + +- Initial Release (Version 3.1.1) + diff --git a/Modules.spec b/Modules.spec new file mode 100644 index 0000000..e7c69d9 --- /dev/null +++ b/Modules.spec @@ -0,0 +1,123 @@ +# +# spec file for package Modules (Version 3.1.6) +# +# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# This file and all modifications and additions to the pristine +# package are under the same license as the package itself. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org +# + +# norootforbuild + +Name: Modules +BuildRequires: tcl-devel xorg-x11-devel +URL: http://modules.sourceforge.net/ +Version: 3.1.6 +Release: 38 +Summary: Environment Modules +License: GPL, LGPL +Group: System/Management +Requires: tcl +Autoreqprov: on +Source: modules-%{version}.tar.bz2 +Patch: modules-%{version}.dif +Patch1: modules_tmpfile.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Provides: environment-modules +Obsoletes: environment-modules + +%description +The Modules package provides for the dynamic modification of a user's +environment via modulefiles. Each modulefile contains the information +needed to configure the shell for an application. Once the Modules +package is initialized, the environment can be modified dynamically on +a per-module basis using the module command which interprets +modulefiles. Typically modulefiles instruct the module command to alter +or set shell environment variables such as PATH, MANPATH, etc. +modulefiles may be shared by many users on a system and users may have +their own collection to supplement or replace the shared modulefiles. +The modules environment is common on SGI/Crays and many workstation +farms. + + + +Authors: +-------- + John L. Furlan + Peter W. Osel + Jens Hamisch + R.K. Owen + +%prep +%setup -q -n modules-%{version} +%patch +%patch1 -p1 + +%build +#autoreconf --force --install +autoconf +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ./configure \ + --prefix=/usr \ + --with-version-path=/usr/share/modules \ + --with-module-path=/usr/share/modules/modulefiles \ + --mandir=%{_mandir} \ + --with-etc-path=/etc \ + --with-skel-path=/etc/skel \ + --with-tcl-libraries=/usr \ + --without-x +make + +%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/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 +make DESTDIR=$RPM_BUILD_ROOT install +rm $RPM_BUILD_ROOT/usr/bin/mkroot + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root) +%doc xref/* ChangeLog LICENSE.GPL PROBLEMS README TODO doc/Modules-Paper.doc +/usr/bin/modulecmd +%dir /usr/share/modules +/usr/share/modules/* +/usr/bin/add.modules +/etc/profile.d/modules.* +%doc %{_mandir}/man4/* +%doc %{_mandir}/man1/* + +%changelog -n Modules +* 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) diff --git a/modules-3.1.6.dif b/modules-3.1.6.dif new file mode 100644 index 0000000..e292e52 --- /dev/null +++ b/modules-3.1.6.dif @@ -0,0 +1,403 @@ +--- 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= use module path= [/usr/local/Modules/modulefiles]], ++ [ --with-module-path= use module 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 { + diff --git a/modules-3.1.6.tar.bz2 b/modules-3.1.6.tar.bz2 new file mode 100644 index 0000000..2e7821c --- /dev/null +++ b/modules-3.1.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71480a98fce28e7604c63e5dbd7db1848a052e1342f4c8ab2d2d39b1842efbcb +size 337554 diff --git a/modules_tmpfile.patch b/modules_tmpfile.patch new file mode 100644 index 0000000..000f5ac --- /dev/null +++ b/modules_tmpfile.patch @@ -0,0 +1,16 @@ +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); + diff --git a/ready b/ready new file mode 100644 index 0000000..473a0f4