[gentoo-commits] gentoo-x86 commit in sci-libs/ccp4-libs/files: ccp4-libs-6.1.3-format-security.patch ccp4-libs-6.1.3-force.patch

[Justin Lecher (jlec)]

jlec        15/03/16 13:44:11

  Added:                ccp4-libs-6.1.3-format-security.patch
                        ccp4-libs-6.1.3-force.patch
  Log:
  Force error on build failure, bug #543028; fix for format-security
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
B9D4F231BD1558AB!)

Revision  Changes    Path
1.1                  
sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-format-security.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-format-security.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-format-security.patch?rev=1.1&content-type=text/plain

Index: ccp4-libs-6.1.3-format-security.patch
===================================================================
 lib/DiffractionImage/DiffractionImagePythonInterface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/DiffractionImage/DiffractionImagePythonInterface.cpp 
b/lib/DiffractionImage/DiffractionImagePythonInterface.cpp
index f729fc5..4c24e82 100755
--- a/lib/DiffractionImage/DiffractionImagePythonInterface.cpp
+++ b/lib/DiffractionImage/DiffractionImagePythonInterface.cpp
@@ -867,7 +867,7 @@ SWIG_Python_AddErrorMsg(const char* mesg)
     Py_DECREF(old_str);
     Py_DECREF(value);
   } else {
-    PyErr_Format(PyExc_RuntimeError, mesg);
+    PyErr_Format(PyExc_RuntimeError, "%s", mesg);
   }
 }
 



1.1                  sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-force.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-force.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ccp4-libs/files/ccp4-libs-6.1.3-force.patch?rev=1.1&content-type=text/plain

Index: ccp4-libs-6.1.3-force.patch
===================================================================
 Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 60033eb..13ddbd0 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,7 +53,7 @@ clipper: FORCE fftw
 
 diffractionImg: 
        if test -n "$(diffimdir)"; then cd $(top_srcdir)/$(diffimdir); \
-       $(MAKE) -i $(MFLAGS) $(MVARS); else true; fi
+       $(MAKE) $(MFLAGS) $(MVARS); fi
 
 ssm: 
        if test -n "$(ssmdir)"; then cd $(top_srcdir)/$(ssmdir); \