- added cppcompat patch (make rpmdb.h C++ compatible)

[packages/rpm.git] / rpm.spec

diff --git a/rpm.spec b/rpm.spec
index 5998f6623d1b04fa64b1b2ca52765f290a0c154d..23e71066382b451aa035670e7a4d50cca1d30332 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -51,7 +51,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       5.4.15
-Release:       7
+Release:       11
 License:       LGPL v2.1
 Group:         Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.15-0.20140824.src.rpm
@@ -170,6 +170,13 @@ Patch80:   %{name}-revert-gpg-argv-parsing.patch
 Patch81:       %{name}-perl-magic.patch
 Patch82:       %{name}-5.4.15-use-DSA-sig.patch
 Patch83:       %{name}-ignore-missing-macro-files.patch
+Patch84:       x32.patch
+Patch85:       rpm-CVE-2013-6435.patch
+Patch86:       rpm-CVE-2014-8118.patch
+Patch87:       %{name}-file-output-for-ELF.patch
+Patch88:       %{name}-rpmtdnext.patch
+Patch89:       disable-header-verification.patch
+Patch90:       %{name}-cppcompat.patch
 
 # Patches imported from Mandriva
 
@@ -374,9 +381,16 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                x8664   amd64 ia32e x86_64
 
 # stabilize new build environment
+%ifnarch x32
 %define                __newcc %{?force_cc}%{!?force_cc:%{_target_cpu}-pld-linux-gcc}
 %define                __newcxx %{?force_cxx}%{!?force_cxx:%{_target_cpu}-pld-linux-g++}
 %define                __newcpp %{?force_cpp}%{!?force_cpp:%{_target_cpu}-pld-linux-gcc -E}
+%else
+# x32 is a very special case
+%define                __newcc %{?force_cc}%{!?force_cc:x86_64-pld-linux-gnux32-gcc}
+%define                __newcxx %{?force_cxx}%{!?force_cxx:x86_64-pld-linux-gnux32-g++}
+%define                __newcpp %{?force_cpp}%{!?force_cpp:x86_64-pld-linux-gnux32-gcc -E}
+%endif
 
 %define                _rpmlibdir /usr/lib/rpm
 %define                _noautocompressdoc      RPM-GPG-KEY
@@ -939,6 +953,13 @@ cd -
 %patch80 -p1
 %patch81 -p0
 %patch82 -p1
+%patch84 -p1
+%patch85 -p1
+%patch86 -p1
+%patch87 -p1
+%patch88 -p1
+%patch89 -p1
+%patch90 -p1
 
 %patch1000 -p1
 %patch1001 -p1
@@ -1102,7 +1123,7 @@ for f in platform/*macros; do
 done
 
 # cleanup
-%ifnarch %{ix86}
+%ifnarch %{ix86} %{x8664} x32
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/athlon-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/i386-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/i486-linux/macros
@@ -1112,10 +1133,10 @@ rm $RPM_BUILD_ROOT%{_rpmlibdir}/pentium3-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/pentium4-linux/macros
 %endif
 
-%ifnarch %{x8664}
+%ifnarch %{x8664} x32
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/amd64-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/ia32e-linux/macros
-rm $RPM_BUILD_ROOT%{_rpmlibdir}/x32*-linux/macros
+rm $RPM_BUILD_ROOT%{_rpmlibdir}/x32-linux/macros
 rm $RPM_BUILD_ROOT%{_rpmlibdir}/x86_64-linux/macros
 %endif
 
@@ -1135,40 +1156,51 @@ rm $RPM_BUILD_ROOT%{_rpmlibdir}/sparc*-linux/macros
 
 cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/rpm/platform
 # first platform file entry can't contain regexps
+%ifarch x32
+%{_target_cpu}-%{_target_vendor}-linux-gnux32
+%else
 %{_target_cpu}-%{_target_vendor}-linux
+%endif
 
 %ifarch x86_64
 x86_64-[^-]*-[Ll]inux(-gnu)?
 amd64-[^-]*-[Ll]inux(-gnu)?
+x32-[^-]*-[Ll]inux(-gnu(x32)?)?
 %endif
 %ifarch amd64
 amd64-[^-]*-[Ll]inux(-gnu)?
 x86_64-[^-]*-[Ll]inux(-gnu)?
+x32-[^-]*-[Ll]inux(-gnu(x32)?)?
 %endif
 %ifarch ia32e
 ia32e-[^-]*-[Ll]inux(-gnu)?
 x86_64-[^-]*-[Ll]inux(-gnu)?
 %endif
+%ifarch x32
+x32-[^-]*-[Ll]inux(-gnu(x32)?)?
+x86_64-[^-]*-[Ll]inux(-gnu)?
+amd64-[^-]*-[Ll]inux(-gnu)?
+%endif
 
-%ifarch athlon %{x8664}
+%ifarch athlon %{x8664} x32
 athlon-[^-]*-[Ll]inux(-gnu)?
 %endif
-%ifarch pentium4 athlon %{x8664}
+%ifarch pentium4 athlon %{x8664} x32
 pentium4-[^-]*-[Ll]inux(-gnu)?
 %endif
-%ifarch pentium3 pentium4 athlon %{x8664}
+%ifarch pentium3 pentium4 athlon %{x8664} x32
 pentium3-[^-]*-[Ll]inux(-gnu)?
 %endif
-%ifarch i686 pentium3 pentium4 athlon %{x8664}
+%ifarch i686 pentium3 pentium4 athlon %{x8664} x32
 i686-[^-]*-[Ll]inux(-gnu)?
 %endif
-%ifarch i586 i686 pentium3 pentium4 athlon %{x8664}
+%ifarch i586 i686 pentium3 pentium4 athlon %{x8664} x32
 i586-[^-]*-[Ll]inux(-gnu)?
 %endif
-%ifarch i486 i586 i686 pentium3 pentium4 athlon %{x8664}
+%ifarch i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32
 i486-[^-]*-[Ll]inux(-gnu)?
 %endif
-%ifarch %{ix86} %{x8664}
+%ifarch %{ix86} %{x8664} x32
 i386-[^-]*-[Ll]inux(-gnu)?
 %endif
 
@@ -1384,7 +1416,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %{_rpmlibdir}/macros.d/pld
 %{_rpmlibdir}/cpuinfo.yaml
 %{_rpmlibdir}/noarch-*
-%ifarch %{ix86}
+%ifarch %{ix86} %{x8664} x32
 %{_rpmlibdir}/i?86*
 %{_rpmlibdir}/pentium*
 %{_rpmlibdir}/athlon*
@@ -1404,10 +1436,11 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %ifarch sparc sparc64
 %{_rpmlibdir}/sparc*
 %endif
-%ifarch %{x8664}
+%ifarch %{x8664} x32
 %{_rpmlibdir}/amd64*
 %{_rpmlibdir}/ia32e*
 %{_rpmlibdir}/x86_64*
+%{_rpmlibdir}/x32*
 %endif
 
 %attr(755,root,root) %{_rpmlibdir}/hrmib-cache