1 |
jlec 12/06/23 11:21:23 |
2 |
|
3 |
Modified: molden-4.8-overflow.patch |
4 |
Added: molden-5.0-ambfor.patch |
5 |
Log: |
6 |
sci-chemistry/molden: Fix buffer overflow, #342907; Version Bump, #355741; Fix build failures, #358917, #423015; drop old |
7 |
|
8 |
(Portage version: 2.2.0_alpha111/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.2 sci-chemistry/molden/files/molden-4.8-overflow.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molden/files/molden-4.8-overflow.patch?rev=1.2&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molden/files/molden-4.8-overflow.patch?rev=1.2&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molden/files/molden-4.8-overflow.patch?r1=1.1&r2=1.2 |
16 |
|
17 |
Index: molden-4.8-overflow.patch |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/molden/files/molden-4.8-overflow.patch,v |
20 |
retrieving revision 1.1 |
21 |
retrieving revision 1.2 |
22 |
diff -u -r1.1 -r1.2 |
23 |
--- molden-4.8-overflow.patch 26 Feb 2010 05:33:33 -0000 1.1 |
24 |
+++ molden-4.8-overflow.patch 23 Jun 2012 11:21:23 -0000 1.2 |
25 |
@@ -1,7 +1,33 @@ |
26 |
-diff -Naur molden4.8/xwin.c molden4.8.new//xwin.c |
27 |
---- molden4.8/xwin.c 2010-02-01 08:04:08.000000000 -0500 |
28 |
-+++ molden4.8.new//xwin.c 2010-02-26 00:03:36.000000000 -0500 |
29 |
-@@ -27353,7 +27353,7 @@ |
30 |
+ xwin.c | 10 ++++++---- |
31 |
+ 1 files changed, 6 insertions(+), 4 deletions(-) |
32 |
+ |
33 |
+diff --git a/xwin.c b/xwin.c |
34 |
+index f395909..092edff 100644 |
35 |
+--- a/xwin.c |
36 |
++++ b/xwin.c |
37 |
+@@ -13552,7 +13552,7 @@ void NewActiveStruct() |
38 |
+ #ifdef CRAY |
39 |
+ _fcd ztr; |
40 |
+ #else |
41 |
+- char ztr; |
42 |
++ char ztr[4]; |
43 |
+ #endif |
44 |
+ #endif |
45 |
+ |
46 |
+@@ -13650,8 +13650,10 @@ void NewActiveStruct() |
47 |
+ */ |
48 |
+ clfpstr->ihashz = 0; |
49 |
+ #else |
50 |
+- strncpy(&ztr,HetAtm[j],3); |
51 |
+- parhet_(&j1,&ztr); |
52 |
++ if (HetAtm[j] != NULL) { |
53 |
++ strncpy(ztr,HetAtm[j],3); |
54 |
++ parhet_(&j1,ztr); |
55 |
++ } |
56 |
+ #endif |
57 |
+ #endif |
58 |
+ } |
59 |
+@@ -27353,7 +27355,7 @@ char *errstr; |
60 |
UpdateZME(); |
61 |
RedrawScroll(&zscroll); |
62 |
} |
63 |
|
64 |
|
65 |
|
66 |
1.1 sci-chemistry/molden/files/molden-5.0-ambfor.patch |
67 |
|
68 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molden/files/molden-5.0-ambfor.patch?rev=1.1&view=markup |
69 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/molden/files/molden-5.0-ambfor.patch?rev=1.1&content-type=text/plain |
70 |
|
71 |
Index: molden-5.0-ambfor.patch |
72 |
=================================================================== |
73 |
ambfor/makefile | 2 +- |
74 |
1 files changed, 1 insertions(+), 1 deletions(-) |
75 |
|
76 |
diff --git a/ambfor/makefile b/ambfor/makefile |
77 |
index 8627a11..dbc23a1 100644 |
78 |
--- a/ambfor/makefile |
79 |
+++ b/ambfor/makefile |
80 |
@@ -47,7 +47,7 @@ ambmd: md.o verlet.o qvdw.o allocmd.o $(OBJS) |
81 |
$(LDR) -o ambmd md.o verlet.o qvdw.o allocmd.o $(OBJS) $(LIBS) |
82 |
|
83 |
ambfor.o: ambfor.f |
84 |
- ${FC} -c -g -ffast-math -funroll-loops -o ambfor.o ambfor.f |
85 |
+ ${FC} $(FFLAGS) -c -o ambfor.o ambfor.f |
86 |
|
87 |
allocmd.o: alloc.c |
88 |
$(CC) $(CFLAGS) -DMD -c alloc.c -o allocmd.o |