- added CVE-2006-5466 patch

[packages/rpm.git] / rpm-macros.patch

diff --git a/rpm-macros.patch b/rpm-macros.patch
index ec86e8e146e1d7af81440844e87055276daf2620..2f96d3077116a0e384b76c8478f6f64eedf21624 100644 (file)
--- a/rpm-macros.patch
+++ b/rpm-macros.patch
@@ -21,6 +21,15 @@ diff -Nur rpm-4.4.6.orig/macros.in rpm-4.4.6.macros/macros.in
  
  #     Archive formats to use for source/binary package payloads.
  #             "cpio"          cpio archive (default)
+@@ -481,7 +481,7 @@
+ 
+ #
+ # Path to magic file used for file classification.
+-%_rpmfc_magic_path    %{_usr}/lib/rpm/magic
++%_rpmfc_magic_path    /usr/share/file/magic
+ 
+ #==============================================================================
+ # ---- Database configuration macros.
 @@ -909,10 +909,10 @@
    export RPM_BUILD_ROOT}\
    %{?_javaclasspath:CLASSPATH=\"%{_javaclasspath}\"\
@@ -34,7 +43,7 @@ diff -Nur rpm-4.4.6.orig/macros.in rpm-4.4.6.macros/macros.in
    \
    %{verbose:set -x}%{!verbose:exec > /dev/null}\
    umask 022\
-@@ -1350,5 +1350,22 @@
+@@ -1350,5 +1350,23 @@
  #%__executable_provides       @RPMCONFIGDIR@/executabledeps.sh --provides
  #%__executable_requires       @RPMCONFIGDIR@/executabledeps.sh --requires
  
@@ -44,7 +53,8 @@ diff -Nur rpm-4.4.6.orig/macros.in rpm-4.4.6.macros/macros.in
 +#-----------------------------------------------------------------
 +# CFLAGS and LDFLAGS used to build
 +
-+%debuginfocflags      %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2 -feliminate-dwarf2-dups}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
++%debuginfocflags      %{expand:%%define __dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-2 -g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
++# -feliminate-dwarf2-dups disabled until PR ld/3290 is fixed.
 +
 +%debugcflags  -O0 -g -Wall
 +%optldflags   -Wl,--as-needed
@@ -57,3 +67,4 @@ diff -Nur rpm-4.4.6.orig/macros.in rpm-4.4.6.macros/macros.in
 +
  # \endverbatim
  #*/
+