summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Felisberto <humpback@gentoo.org>2005-06-26 15:12:31 +0000
committerGustavo Felisberto <humpback@gentoo.org>2005-06-26 15:12:31 +0000
commitafde286bbb101bf0e5cdd8a63a07f66c4087915c (patch)
tree2089980e99a7d5672b9fbfe7495f856cd3a8deb9 /net-im/psi/files
parentgraphviz useflags (diff)
downloadgentoo-2-afde286bbb101bf0e5cdd8a63a07f66c4087915c.tar.gz
gentoo-2-afde286bbb101bf0e5cdd8a63a07f66c4087915c.tar.bz2
gentoo-2-afde286bbb101bf0e5cdd8a63a07f66c4087915c.zip
house cleaning
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'net-im/psi/files')
-rw-r--r--net-im/psi/files/digest-psi-0.9.21
-rw-r--r--net-im/psi/files/digest-psi-0.9.2-r11
-rw-r--r--net-im/psi/files/psi_gpg_fix57
3 files changed, 0 insertions, 59 deletions
diff --git a/net-im/psi/files/digest-psi-0.9.2 b/net-im/psi/files/digest-psi-0.9.2
deleted file mode 100644
index 675424f904aa..000000000000
--- a/net-im/psi/files/digest-psi-0.9.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e29f90aea7d839f2a70e4a6e77e95a70 psi-0.9.2.tar.bz2 1154392
diff --git a/net-im/psi/files/digest-psi-0.9.2-r1 b/net-im/psi/files/digest-psi-0.9.2-r1
deleted file mode 100644
index 675424f904aa..000000000000
--- a/net-im/psi/files/digest-psi-0.9.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e29f90aea7d839f2a70e4a6e77e95a70 psi-0.9.2.tar.bz2 1154392
diff --git a/net-im/psi/files/psi_gpg_fix b/net-im/psi/files/psi_gpg_fix
deleted file mode 100644
index b1420e1c557e..000000000000
--- a/net-im/psi/files/psi_gpg_fix
+++ /dev/null
@@ -1,57 +0,0 @@
---- 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;
- }