diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-06-23 11:21:23 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-06-23 11:21:23 +0000 |
| commit | 7a64a209b80b150128474b1f08b220bbe1ffbfff (patch) | |
| tree | 1e2a8a42ba4583b4c29ddcda479a8e05f61e53e7 /sci-chemistry/molden/files | |
| parent | Don't install docs that are no longer there, thanks to David Abbott for the p... (diff) | |
| download | gentoo-2-7a64a209b80b150128474b1f08b220bbe1ffbfff.tar.gz gentoo-2-7a64a209b80b150128474b1f08b220bbe1ffbfff.tar.bz2 gentoo-2-7a64a209b80b150128474b1f08b220bbe1ffbfff.zip | |
sci-chemistry/molden: Fix buffer overflow, #342907; Version Bump, #355741; Fix build failures, #358917, #423015; drop old
(Portage version: 2.2.0_alpha111/cvs/Linux x86_64)
Diffstat (limited to 'sci-chemistry/molden/files')
| -rw-r--r-- | sci-chemistry/molden/files/molden-4.8-overflow.patch | 34 | ||||
| -rw-r--r-- | sci-chemistry/molden/files/molden-5.0-ambfor.patch | 16 |
2 files changed, 46 insertions, 4 deletions
diff --git a/sci-chemistry/molden/files/molden-4.8-overflow.patch b/sci-chemistry/molden/files/molden-4.8-overflow.patch index 811664d4923b..7cbd7f436f57 100644 --- a/sci-chemistry/molden/files/molden-4.8-overflow.patch +++ b/sci-chemistry/molden/files/molden-4.8-overflow.patch @@ -1,7 +1,33 @@ -diff -Naur molden4.8/xwin.c molden4.8.new//xwin.c ---- molden4.8/xwin.c 2010-02-01 08:04:08.000000000 -0500 -+++ molden4.8.new//xwin.c 2010-02-26 00:03:36.000000000 -0500 -@@ -27353,7 +27353,7 @@ + xwin.c | 10 ++++++---- + 1 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/xwin.c b/xwin.c +index f395909..092edff 100644 +--- a/xwin.c ++++ b/xwin.c +@@ -13552,7 +13552,7 @@ void NewActiveStruct() + #ifdef CRAY + _fcd ztr; + #else +- char ztr; ++ char ztr[4]; + #endif + #endif + +@@ -13650,8 +13650,10 @@ void NewActiveStruct() + */ + clfpstr->ihashz = 0; + #else +- strncpy(&ztr,HetAtm[j],3); +- parhet_(&j1,&ztr); ++ if (HetAtm[j] != NULL) { ++ strncpy(ztr,HetAtm[j],3); ++ parhet_(&j1,ztr); ++ } + #endif + #endif + } +@@ -27353,7 +27355,7 @@ char *errstr; UpdateZME(); RedrawScroll(&zscroll); } diff --git a/sci-chemistry/molden/files/molden-5.0-ambfor.patch b/sci-chemistry/molden/files/molden-5.0-ambfor.patch new file mode 100644 index 000000000000..9656ff7a79be --- /dev/null +++ b/sci-chemistry/molden/files/molden-5.0-ambfor.patch @@ -0,0 +1,16 @@ + ambfor/makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/ambfor/makefile b/ambfor/makefile +index 8627a11..dbc23a1 100644 +--- a/ambfor/makefile ++++ b/ambfor/makefile +@@ -47,7 +47,7 @@ ambmd: md.o verlet.o qvdw.o allocmd.o $(OBJS) + $(LDR) -o ambmd md.o verlet.o qvdw.o allocmd.o $(OBJS) $(LIBS) + + ambfor.o: ambfor.f +- ${FC} -c -g -ffast-math -funroll-loops -o ambfor.o ambfor.f ++ ${FC} $(FFLAGS) -c -o ambfor.o ambfor.f + + allocmd.o: alloc.c + $(CC) $(CFLAGS) -DMD -c alloc.c -o allocmd.o |