[packages/rpm] - reenable NOSIGNATURES - relase 3

baggins baggins at pld-linux.org
Sat Sep 22 01:26:37 CEST 2012


commit e85b33bbfa6588fe5fcfe26d00630b3c5b80c991
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Sep 22 01:26:16 2012 +0200

    - reenable NOSIGNATURES
    - relase 3

 rpm-5.4.9-support-signatures-and-digest-disablers.patch | 11 +++++++++++
 rpm.spec                                                |  5 ++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
---
diff --git a/rpm.spec b/rpm.spec
index 189bb3e..2938762 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -48,7 +48,7 @@ Summary(ru.UTF-8):	Менеджер пакетов от RPM
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	5.4.10
-Release:	2
+Release:	3
 License:	LGPL
 Group:		Base
 # http://rpm5.org/files/rpm/rpm-5.4/rpm-5.4.10-0.20120706.src.rpm
@@ -235,6 +235,8 @@ Patch1037:	rpm-5.4.10-fix-neon-saving-error-pages-as-target-file.patch
 Patch1038:	rpm-5.4.10-support-ignore-arch-and-os-again.patch
 # status: ready for merge
 Patch1039:	rpm-5.4.4-fix-same-package-with-epoch-possible-to-upgrade.patch
+# we want that patch too, a bit of builder infrastructure relies on NOSIGNATURES
+Patch1040:	rpm-5.4.9-support-signatures-and-digest-disablers.patch
 
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.60
@@ -844,6 +846,7 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 %patch1037 -p1
 %patch1038 -p1
 %patch1039 -p1
+%patch1040 -p1
 
 install %{SOURCE2} macros/pld.in
 install %{SOURCE8} scripts/php.prov.in
diff --git a/rpm-5.4.9-support-signatures-and-digest-disablers.patch b/rpm-5.4.9-support-signatures-and-digest-disablers.patch
new file mode 100644
index 0000000..af9e1a7
--- /dev/null
+++ b/rpm-5.4.9-support-signatures-and-digest-disablers.patch
@@ -0,0 +1,11 @@
+--- rpm-5.4.9/system.h.nosig~	2012-05-16 20:52:58.216415034 +0200
++++ rpm-5.4.9/system.h	2012-05-16 20:53:29.053598105 +0200
+@@ -746,7 +746,7 @@ static inline const char *rcsid(const ch
+ /**
+  * Eliminate signature/digest disablers.
+  */
+-#undef	SUPPORT_NOSIGNATURES
++#define	SUPPORT_NOSIGNATURES 1
+ 
+ /**
+  * Permit ar(1) payloads. Disabled while rpmio/iosm.c is under development.
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list