Attachment 909824 Details for Bug 1106244 – Patch for rawhide

[patch] Patch for rawhide

0001-Fix-FTBFS-with-Werror-format-security-1106244.patch (text/plain), 3.94 KB, created by Yaakov Selkowitz on 2014-06-18 02:50:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yaakov Selkowitz

Created: 2014-06-18 02:50:35 UTC

Size: 3.94 KB

patch

obsolete

>From 392e16c0c52a1f6cb7fb4f54bf658d3a95f2a94b Mon Sep 17 00:00:00 2001
>From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
>Date: Tue, 17 Jun 2014 21:50:09 -0500
>Subject: [PATCH] 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(-)
> create mode 100644 mpqc-2.3.1-format-security.patch
>
>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@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@lists.fedoraproject.org> - 2.3.1-25
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
> 
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1106244: 904292 | 904293 | 904294 | 909824