[pkgsrc/trunk]: pkgsrc/chat/psi Apply patch from Martin Ehmsen via lha@ in PR...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c18a7ab6c861
branches:  trunk
changeset: 463583:c18a7ab6c861
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Tue Nov 18 17:54:48 2003 +0000

description:
Apply patch from Martin Ehmsen via lha@ in PR pkg/23426 to make psi work
with gnupg-1.2.3. This also closes pkg/23416 by Steven M.Bellovin.

Bump PKGREVISION.

diffstat:

 chat/psi/Makefile         |   4 +-
 chat/psi/distinfo         |   3 +-
 chat/psi/patches/patch-aa |  62 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 3 deletions(-)

diffs (92 lines):

diff -r af281844f9b5 -r c18a7ab6c861 chat/psi/Makefile
--- a/chat/psi/Makefile Tue Nov 18 16:36:00 2003 +0000
+++ b/chat/psi/Makefile Tue Nov 18 17:54:48 2003 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/08/11 17:28:20 jdolecek Exp $
+# $NetBSD: Makefile,v 1.14 2003/11/18 17:54:48 xtraeme Exp $
 
 DISTNAME=      psi-0.9
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    chat
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=psi/}
 EXTRACT_SUFX=  .tar.bz2
diff -r af281844f9b5 -r c18a7ab6c861 chat/psi/distinfo
--- a/chat/psi/distinfo Tue Nov 18 16:36:00 2003 +0000
+++ b/chat/psi/distinfo Tue Nov 18 17:54:48 2003 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2003/09/18 19:58:08 wiz Exp $
+$NetBSD: distinfo,v 1.8 2003/11/18 17:54:48 xtraeme Exp $
 
 SHA1 (psi-0.9.tar.bz2) = 66ab7a6b540f60c9e117bc964a70c126b30aff47
 Size (psi-0.9.tar.bz2) = 968348 bytes
+SHA1 (patch-aa) = 7cb3505e80c180411257ea5755a351e57d77de9b
 SHA1 (patch-ab) = d7f9fc5f183117d3f81912ef73f27c0f2fa8c6a0
 SHA1 (patch-ac) = a3b0f87f54f4d7397c8be6f152209bef3a14d4a6
 SHA1 (patch-ad) = 8d255aa9de01ccb39d2cdc7b0074b5dec0e3c0cb
diff -r af281844f9b5 -r c18a7ab6c861 chat/psi/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/psi/patches/patch-aa Tue Nov 18 17:54:48 2003 +0000
@@ -0,0 +1,62 @@
+$NetBSD: patch-aa,v 1.3 2003/11/18 17:54:48 xtraeme Exp $
+
+Patch from Martin Ehmsen to make psi work with gpg-1.2.3 (and
+versions before that).
+
+--- cutestuff/openpgp/gpgop.cpp        2003-05-26 19:40:28.000000000 +0200
++++ 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;
+ }