[mpqc] Fix FTBFS with -Werror=format-security (#1106244)
Yaakov Selkowitz
yselkowitz at fedoraproject.org
Tue Jul 8 20:20:52 UTC 2014
commit 392e16c0c52a1f6cb7fb4f54bf658d3a95f2a94b
Author: Yaakov Selkowitz <yselkowitz at users.sourceforge.net>
Date: Tue Jun 17 21:50:09 2014 -0500
Fix FTBFS with -Werror=format-security (#1106244)
mpqc-2.3.1-format-security.patch | 13 +++++++++++++
mpqc.spec | 18 +++++++-----------
2 files changed, 20 insertions(+), 11 deletions(-)
---
diff --git a/mpqc-2.3.1-format-security.patch b/mpqc-2.3.1-format-security.patch
new file mode 100644
index 0000000..7f253ff
--- /dev/null
+++ b/mpqc-2.3.1-format-security.patch
@@ -0,0 +1,13 @@
+diff --git a/src/lib/chemistry/molecule/atominfo.cc b/src/lib/chemistry/molecule/atominfo.cc
+index de75dcd..a0a60c9 100644
+--- a/src/lib/chemistry/molecule/atominfo.cc
++++ b/src/lib/chemistry/molecule/atominfo.cc
+@@ -493,7 +493,7 @@ AtomInfo::string_to_Z(const std::string &name, int allow_exceptions)
+ if (iname != symbol_to_Z_.end()) return iname->second;
+
+ if (allow_exceptions) {
+- ExEnv::err0() << sprintf("AtomInfo: invalid name: %s\n",name.c_str());
++ ExEnv::err0() << scprintf("AtomInfo: invalid name: %s\n",name.c_str());
+ throw std::runtime_error("invalid atom name");
+ }
+
diff --git a/mpqc.spec b/mpqc.spec
index 74b6f2e..cda8e69 100644
--- a/mpqc.spec
+++ b/mpqc.spec
@@ -1,18 +1,18 @@
Name: mpqc
Summary: Ab-inito chemistry program
Version: 2.3.1
-Release: 25%{?dist}
+Release: 26%{?dist}
License: GPLv2+ and LGPLv2+
Group: Applications/Engineering
URL: http://www.mpqc.org/
Source: http://downloads.sourceforge.net/mpqc/%{name}-%{version}.tar.bz2
Patch0: mpqc-2.3.1-mdv-fix-wfn-lib.patch
+Patch1: mpqc-2.3.1-format-security.patch
Requires: %{name}-libs = %{version}-%{release}
BuildRequires: libtool flex bison
BuildRequires: desktop-file-utils
BuildRequires: gcc-gfortran tk doxygen
BuildRequires: libint-devel atlas-devel
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
# Libint can have API breakage between releases
Requires: libint%{?_isa} = %{_libint_version}
@@ -66,6 +66,7 @@ based on mpqc computational chemistry package from Sandia Labs.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
sed -i -e 's,molrender.in,%{_datadir}/molrender/molrender.in,g' src/bin/molrender/tkmolrender.in
sed -i -e 's,prefix/lib,prefix/%{_lib},g' configure.in
# fixup for modern autoreconf
@@ -117,7 +118,6 @@ make man1
make man3
%install
-rm -rf %{buildroot}
make installroot="%{buildroot}" INSTALL="install -p" install
make installroot="%{buildroot}" INSTALL="install -p" install_devel
# rename some man pages with sc_ prefix
@@ -138,15 +138,11 @@ sed -i -e "1,1s,^.*$,#!/usr/bin/perl," %{buildroot}%{_bindir}/sc-mkf77sym
sed -i -e "1,1s,^.*$,#!/usr/bin/perl -I%{_datadir}/mpqc/${_version}/perl," %{buildroot}%{_bindir}/chkmpqcout
chmod 755 %{buildroot}%{_bindir}/chkmpqcout
-%clean
-rm -rf %{buildroot}
-
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
%doc CHANGES CITATION README
%{_bindir}/mpqc
%{_bindir}/chkmpqcout
@@ -163,21 +159,17 @@ rm -rf %{buildroot}
%{_mandir}/man1/molrender*
%files data
-%defattr(-,root,root,-)
%{_datadir}/mpqc
%files doc
-%defattr(-,root,root,-)
%doc doc/html
%doc LICENSE COPYING COPYING.LIB
%files libs
-%defattr(-,root,root)
%doc LICENSE COPYING COPYING.LIB
%{_libdir}/lib*.so.*
%files devel
-%defattr(-,root,root,-)
%{_bindir}/sc-*
%{_libdir}/lib*.so
%{_includedir}/mpqc
@@ -186,6 +178,10 @@ rm -rf %{buildroot}
%changelog
+* Tue Jun 17 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 2.3.1-26
+- Fix FTBFS with -Werror=format-security (#1106244)
+- Update to recent packaging guidelines
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.1-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list