rpms/synaptic/F-10 synaptic-0.57.2-nss-hack.patch, NONE, 1.1 synaptic.spec, 1.35, 1.36

[Panu Matilainen]

Author: pmatilai

Update of /cvs/pkgs/rpms/synaptic/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2239

Modified Files:
	synaptic.spec 
Added Files:
	synaptic-0.57.2-nss-hack.patch 
Log Message:
- shutdown rpm crypto after fork to force proper reinitialization (#449168)


synaptic-0.57.2-nss-hack.patch:

--- NEW FILE synaptic-0.57.2-nss-hack.patch ---
diff -up synaptic-0.57.2/common/rinstallprogress.cc.nss-hack synaptic-0.57.2/common/rinstallprogress.cc
--- synaptic-0.57.2/common/rinstallprogress.cc.nss-hack	2009-02-28 11:35:14.000000000 +0200
+++ synaptic-0.57.2/common/rinstallprogress.cc	2009-02-28 11:36:29.000000000 +0200
@@ -33,6 +33,7 @@
 #include <apt-pkg/error.h>
 #ifdef HAVE_RPM
 #include <apt-pkg/configuration.h>
+#include <rpm/rpmpgp.h>
 #endif
 
 #include "rinstallprogress.h"
@@ -99,6 +100,7 @@ pkgPackageManager::OrderResult RInstallP
       close(fd[0]);
       close(fd[1]);
 
+      rpmFreeCrypto();
       res = pm->DoInstallPostFork();
       // dump errors into cerr (pass it to the parent process)	
       _error->DumpErrors();


Index: synaptic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/synaptic/F-10/synaptic.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- synaptic.spec	2 Aug 2008 00:47:59 -0000	1.35
+++ synaptic.spec	7 Mar 2009 10:05:18 -0000	1.36
@@ -3,7 +3,7 @@
 Summary: Graphical frontend for APT package manager.
 Name: synaptic
 Version: 0.57.2
-Release: 17%{?dist}
+Release: 18%{?dist}
 
 License: GPLv2+
 Group: Applications/System
@@ -17,6 +17,7 @@
 Patch4: http://apt-rpm.org/patches/synaptic-0.57.2-showprog.patch
 Patch5: http://apt-rpm.org/patches/synaptic-0.57.2-progressapi-hack.patch
 Patch6: synaptic-0.57.2-gcc43.patch
+Patch7:	synaptic-0.57.2-nss-hack.patch
 URL: http://www.nongnu.org/synaptic/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: usermode-gtk
@@ -42,6 +43,7 @@
 %patch4 -p1 -b .showprog
 %patch5 -p1 -b .progresshack
 %patch6 -p1 -b .gcc43
+%patch7 -p1 -b .nss-hack
 
 %build
 %configure --disable-dependency-tracking
@@ -114,6 +116,9 @@
 %{_mandir}/man8/%{name}.8*
 
 %changelog
+* Sat Mar 07 2009 Panu Matilainen <pmatilai at redhat.com> - 0.57.2-18
+- shutdown rpm crypto after fork to force proper reinitialization (#449168)
+
 * Fri Aug 01 2008 Alex Lancaster <alexlan[AT] fedoraproject org> - 0.57.2-17
 - Rebuild for new RPM 4.6 (fixes broken deps).