rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

+knewstuff_gpg2 patch

This commit is contained in:
Rex Dieter 2010-08-27 11:06:49 -05:00
parent 96c577407f
commit 6b2c5a32fd
2 changed files with 85 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
kdelibs-4.5.1-knewstuff_gpg2.patch Normal file
View File

@ -0,0 +1,78 @@
diff -up kdelibs-4.5.1/knewstuff/knewstuff2/core/security.cpp.gpg2 kdelibs-4.5.1/knewstuff/knewstuff2/core/security.cpp
--- kdelibs-4.5.1/knewstuff/knewstuff2/core/security.cpp.gpg2 2009-11-30 18:27:20.000000000 -0600
+++ kdelibs-4.5.1/knewstuff/knewstuff2/core/security.cpp 2010-08-27 10:49:10.619703933 -0500
@@ -61,7 +61,7 @@ void Security::readKeys()
m_runMode = List;
m_keys.clear();
m_process = new KProcess();
- *m_process << "gpg"
+ *m_process << "gpg2"
<< "--no-secmem-warning"
<< "--no-tty"
<< "--with-colon"
@@ -87,7 +87,7 @@ void Security::readSecretKeys()
}
m_runMode = ListSecret;
m_process = new KProcess();
- *m_process << "gpg"
+ *m_process << "gpg2"
<< "--no-secmem-warning"
<< "--no-tty"
<< "--with-colon"
@@ -258,7 +258,7 @@ void Security::slotCheckValidity()
//verify the signature
m_process = new KProcess();
- *m_process << "gpg"
+ *m_process << "gpg2"
<< "--no-secmem-warning"
<< "--status-fd=2"
<< "--command-fd=0"
@@ -340,7 +340,7 @@ void Security::slotSignFile()
//verify the signature
m_process = new KProcess();
- *m_process << "gpg"
+ *m_process << "gpg2"
<< "--no-secmem-warning"
<< "--status-fd=2"
<< "--command-fd=0"
diff -up kdelibs-4.5.1/knewstuff/knewstuff3/core/security.cpp.gpg2 kdelibs-4.5.1/knewstuff/knewstuff3/core/security.cpp
--- kdelibs-4.5.1/knewstuff/knewstuff3/core/security.cpp.gpg2 2009-11-30 18:27:19.000000000 -0600
+++ kdelibs-4.5.1/knewstuff/knewstuff3/core/security.cpp 2010-08-27 10:49:50.493454042 -0500
@@ -61,7 +61,7 @@ void Security::readKeys()
m_runMode = List;
m_keys.clear();
m_process = new KProcess();
- *m_process << "gpg"
+ *m_process << "gpg2"
<< "--no-secmem-warning"
<< "--no-tty"
<< "--with-colon"
@@ -87,7 +87,7 @@ void Security::readSecretKeys()
}
m_runMode = ListSecret;
m_process = new KProcess();
- *m_process << "gpg"
+ *m_process << "gpg2"
<< "--no-secmem-warning"
<< "--no-tty"
<< "--with-colon"
@@ -258,7 +258,7 @@ void Security::slotCheckValidity()
//verify the signature
m_process = new KProcess();
- *m_process << "gpg"
+ *m_process << "gpg2"
<< "--no-secmem-warning"
<< "--status-fd=2"
<< "--command-fd=0"
@@ -340,7 +340,7 @@ void Security::slotSignFile()
//verify the signature
m_process = new KProcess();
- *m_process << "gpg"
+ *m_process << "gpg2"
<< "--no-secmem-warning"
<< "--status-fd=2"
<< "--command-fd=0"

8
kdelibs.spec
View File

@ -81,7 +81,11 @@ Patch24: kdelibs-4.3.1-drkonq.patch
# -DCMAKE_SKIP_RPATH:BOOL=ON (finally)
Patch27: kdelibs-4.4.80-no_rpath.patch
# upstreamable
## upstreamable
# add gpg2 support to knewstuff, rough first try s/gpg/gpg2/
# reverting to our past gnupg2-only setup.
# TODO: try to use either gpg or gpg2, whichever is available
Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
## 4.4 upstream
@ -247,6 +251,7 @@ format for use with the Qt 4 Assistant or KDevelop 4.
%patch27 -p1 -b .no_rpath
# upstreamable patches
%patch50 -p1 -b .knewstuff_gpg2
# upstream patches
@ -489,6 +494,7 @@ rm -rf %{buildroot}
%changelog
* Fri Aug 27 2010 Jaroslav Reznik <jreznik@redhat.com> - 4.5.1-1
- 4.5.1
- use gpg2 in knewstuff (kde#249152)
* Thu Aug 26 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.5.0-6
- use ca-certificates' ca-bundle.crt (#521902)