Update to 3.2.9a

Drop strcpy patch
This commit is contained in:
Orion Poplawski 2011-11-11 09:02:22 -07:00
parent 5a9357c2ce
commit 13b6b5a7e9
2 changed files with 7 additions and 17 deletions

View File

@ -1,11 +0,0 @@
--- modules-3.2.8/cmdPath.c.strcpy 2010-09-23 16:47:15.000000000 -0600
+++ modules-3.2.8/cmdPath.c 2011-09-22 12:46:55.893813323 -0600
@@ -797,7 +797,7 @@
** We must be in SW_STATE3 or not in SW_STATE at all.
** Removing the marker should be just like removing any other path.
**/
- strcpy( startp + start_offset, endp);
+ memmove( startp + start_offset, endp, strlen(endp)+1);
/**
** Cache the set. Clear the variable from the unset table just

View File

@ -1,6 +1,6 @@
Name: environment-modules Name: environment-modules
Version: 3.2.8a Version: 3.2.9a
Release: 3%{?dist} Release: 1%{?dist}
Summary: Provides dynamic modification of a user's environment Summary: Provides dynamic modification of a user's environment
Group: System Environment/Base Group: System Environment/Base
@ -10,8 +10,6 @@ Source0: http://downloads.sourceforge.net/modules/modules-%{version}.tar.
Source1: modules.sh Source1: modules.sh
Source2: createmodule.sh Source2: createmodule.sh
Patch0: environment-modules-3.2.7-bindir.patch Patch0: environment-modules-3.2.7-bindir.patch
#Fix overlapping strcpy()
Patch1: environment-modules-strcpy.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: tcl-devel, tclx-devel, libX11-devel BuildRequires: tcl-devel, tclx-devel, libX11-devel
@ -45,9 +43,8 @@ have access to the module alias.
%prep %prep
%setup -q -n modules-3.2.8 %setup -q -n modules-3.2.9
%patch0 -p1 -b .bindir %patch0 -p1 -b .bindir
%patch1 -p1 -b .strcpy
%build %build
@ -86,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Fri Nov 11 2011 Orion Poplawski <orion@cora.nwra.com> - 3.2.9a-1
- Update to 3.2.9a
- Drop strcpy patch
* Thu Sep 22 2011 Orion Poplawski <orion@cora.nwra.com> - 3.2.8a-3 * Thu Sep 22 2011 Orion Poplawski <orion@cora.nwra.com> - 3.2.8a-3
- Add patch to fix overlapping strcpy() in Remove_Path, hopefully fixes - Add patch to fix overlapping strcpy() in Remove_Path, hopefully fixes
bug 737043 bug 737043