[packages/rpm] - fixed rpm-fix--p-interpreter-and-empty-script.patch patch, previous version caused random segfau

[baggins]

commit 1df4fbc2e8d065b4ff64f01478118be03058cb16
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Sep 10 11:18:42 2012 +0200

    - fixed rpm-fix--p-interpreter-and-empty-script.patch patch, previous
      version caused random segfaults
    - disable ldconfig optimization, doesn't hurt to run more ldconfigs and
      http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2012-September/023036.html

 rpm-fix--p-interpreter-and-empty-script.patch | 11 ++++-------
 rpm.spec                                      |  4 ++--
 2 files changed, 6 insertions(+), 9 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index d3ea26f..9ef1bec 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -55,7 +55,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	5.4.10
-Release:	0.10
+Release:	0.11
 License:	LGPL
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -801,7 +801,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
-#%patch42 -p1
+%patch42 -p1
 %patch43 -p1
 
 %patch1000 -p1
diff --git a/rpm-fix--p-interpreter-and-empty-script.patch b/rpm-fix--p-interpreter-and-empty-script.patch
index 8c2f2fc..709b464 100644
--- a/rpm-fix--p-interpreter-and-empty-script.patch
+++ b/rpm-fix--p-interpreter-and-empty-script.patch
@@ -1,15 +1,12 @@
 --- rpm-5.4.10/lib/psm.c~	2012-09-10 07:58:10.220193941 +0200
 +++ rpm-5.4.10/lib/psm.c	2012-09-10 08:00:38.723522037 +0200
-@@ -1172,11 +1172,8 @@
+@@ -1172,8 +1172,7 @@
  
  assert(fi->h != NULL);
      She->tag = psm->scriptTag;
 -    if (!headerGet(fi->h, She, 0))
 -	goto exit;
--
-     Phe->tag = psm->progTag;
--    if (!headerGet(fi->h, Phe, 0))
-+    if (!headerGet(fi->h, She, 0) && !headerGet(fi->h, Phe, 0))
- 	goto exit;
++    headerGet(fi->h, She, 0);
  
-     /* Coerce strings into header argv return. */
+     Phe->tag = psm->progTag;
+     if (!headerGet(fi->h, Phe, 0))
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/1df4fbc2e8d065b4ff64f01478118be03058cb16