fix for latest gnupg version

2 files changed, 59 insertions, 0 deletions

diff --git a/net-im/psi/files/digest-psi-0.9-r1 b/net-im/psi/files/digest-psi-0.9-r1
new file mode 100644
index 000000000000..8b13928a5f68
--- /dev/null
+++ b/net-im/psi/files/digest-psi-0.9-r1
@@ -0,0 +1,2 @@
+MD5 bf3aaa7fa8a1efdff9f96fa718366aa8 psi-0.9.tar.bz2 968348
+MD5 2593eb1e979070edcd07e10442f117dc qssl-2.0.tar.bz2 8317
diff --git a/net-im/psi/files/psi_gpg_fix b/net-im/psi/files/psi_gpg_fix
new file mode 100644
index 000000000000..b1420e1c557e
--- /dev/null
+++ b/net-im/psi/files/psi_gpg_fix
@@ -0,0 +1,57 @@
+--- psi-0.9-orig/cutestuff/openpgp/gpgop.cpp	2003-05-26 19:40:28.000000000 +0200
++++ psi-0.9/cutestuff/openpgp/gpgop.cpp	2003-08-28 00:20:59.000000000 +0200
+@@ -543,18 +543,33 @@
+ 		return false;
+ 
+ 	QStringList::ConstIterator it = lines.begin();
++	QString keyring;
++	int ver = 0;
+ 
+-	// first line is keyring file
+-	QString keyring = *(it++);
+-
+-	// skip past the divider
++	// check if gnupg version is 1.2.3 or below
+ 	for(; it != lines.end(); ++it) {
+-		if((*it).at(0) == '-')
+-			break;
++	   if((*it).at(0) == '-') {
++	      ver = 1;
++	      break;
++	   }
++	}
++
++	it = lines.begin();
++
++	// if gnupg version is 1.2.2 and below first line is keyring
++	if(ver) {
++	   // first line is keyring file
++	   keyring = *(it++);
++
++	   // skip past the divider
++	   for(; it != lines.end(); ++it) {
++	      if((*it).at(0) == '-')
++		 break;
++	   }
++	   if(it == lines.end())
++	      return false;
++	   ++it;
+ 	}
+-	if(it == lines.end())
+-		return false;
+-	++it;
+ 
+ 	OpenPGP::Key *k = 0;
+ 	for(; it != lines.end(); ++it) {
+@@ -620,8 +635,9 @@
+ 
+ 	if(_keylist)
+ 		*_keylist = keyList;
+-	if(_keyring)
+-		*_keyring = keyring;
++	if(ver)
++	   if(_keyring)
++	      *_keyring = keyring;
+ 
+ 	return true;
+ }