From 1bab6385f4e5c12f807ab5b8e98c5b5a2c209be0 Mon Sep 17 00:00:00 2001
From: Kirill Ponomarev <krion@FreeBSD.org>
Date: Mon, 29 Dec 2003 22:26:55 +0000
Subject: - Fix build with x11-toolkits/qt32 - Fix support for gpg - Fix
 bashism in configure

PR:		60644
Submitted by:	Eugene Ossintsev <eugos@gmx.net>
Approved by:	maintainer
---
 net/psi/files/patch-aa | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 net/psi/files/patch-aa

(limited to 'net/psi/files/patch-aa')

diff --git a/net/psi/files/patch-aa b/net/psi/files/patch-aa
new file mode 100644
index 000000000000..930d9fdaaa53
--- /dev/null
+++ b/net/psi/files/patch-aa
@@ -0,0 +1,58 @@
+diff -ur cutestuff.ori/openpgp/gpgop.cpp cutestuff/openpgp/gpgop.cpp
+--- cutestuff.ori/openpgp/gpgop.cpp	Tue Nov 18 18:07:55 2003
++++ cutestuff/openpgp/gpgop.cpp	Tue Nov 18 18:13:37 2003
+@@ -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;
+ }
\ No newline at end of file
-- 
cgit v1.2.3