From d1872ca5c7cf7a99953c3243d30707b5c11c6de0 Mon Sep 17 00:00:00 2001 From: Denis Silakov Date: Wed, 10 Sep 2014 07:06:29 -0400 Subject: [PATCH] -fno-delete-null-pointer-checks by default --- rpm-5.4.10-no-delete-null-pointer-checks.patch | 12 ++++++++++++ rpm.spec | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 rpm-5.4.10-no-delete-null-pointer-checks.patch diff --git a/rpm-5.4.10-no-delete-null-pointer-checks.patch b/rpm-5.4.10-no-delete-null-pointer-checks.patch new file mode 100644 index 0000000..b2ba25a --- /dev/null +++ b/rpm-5.4.10-no-delete-null-pointer-checks.patch @@ -0,0 +1,12 @@ +diff -Naur rpm-5.4.10.orig/macros/mandriva.in rpm-5.4.10/macros/mandriva.in +--- rpm-5.4.10.orig/macros/mandriva.in 2014-09-10 07:00:38.045847753 -0400 ++++ rpm-5.4.10/macros/mandriva.in 2014-09-10 07:01:54.058851415 -0400 +@@ -162,7 +162,7 @@ + %Werror_cflags -Wformat -Werror=format-security + + %_ssp_cflags -fstack-protector --param=ssp-buffer-size=4%{?_serverbuild_flags: %_serverbuild_flags} +-%__common_cflags -O2 %{debugcflags} -pipe %{Werror_cflags} %{?_fortify_cflags} -ffat-lto-objects ++%__common_cflags -O2 %{debugcflags} -pipe %{Werror_cflags} %{?_fortify_cflags} -ffat-lto-objects -fno-delete-null-pointer-checks + %__common_cflags_with_ssp %{__common_cflags} %{?_ssp_cflags} + + # Servers opt flags. diff --git a/rpm.spec b/rpm.spec index 4b23e7b..206246c 100644 --- a/rpm.spec +++ b/rpm.spec @@ -60,7 +60,7 @@ Summary: The RPM package management system Name: rpm Epoch: 1 Version: %{libver}.%{minorver} -Release: %{?prereldate:0.%{prereldate}.}44 +Release: %{?prereldate:0.%{prereldate}.}45 License: LGPLv2.1+ Group: System/Configuration/Packaging Url: http://rpm5.org/ @@ -499,6 +499,9 @@ Patch508: rpm-5.4.10-hardening.patch # -ffat-lto-objects by default Patch509: rpm-5.4.10-fat-lto-objects.patch +# -fno-delete-null-pointer-checks by default +Patch510: rpm-5.4.10-no-delete-null-pointer-checks.patch + BuildRequires: autoconf >= 2.57 BuildRequires: bzip2-devel BuildRequires: automake >= 1.8