From 63fe84597f7f8223aec4538959c273bbc0fe3de8 Mon Sep 17 00:00:00 2001
From: msf <msf@openbsd.org>
Date: Wed, 25 May 2005 06:09:11 +0000
Subject: [PATCH] - update to 0.6.8 - take maintainer ok waldemar brodkorb

ok sturm@
---
 security/tinyca/Makefile                     |  6 ++---
 security/tinyca/distinfo                     |  8 +++---
 security/tinyca/patches/patch-lib_OpenSSL_pm | 28 ++++++++++++++++++++
 security/tinyca/pkg/PLIST                    | 13 ++-------
 4 files changed, 37 insertions(+), 18 deletions(-)
 create mode 100644 security/tinyca/patches/patch-lib_OpenSSL_pm

diff --git a/security/tinyca/Makefile b/security/tinyca/Makefile
index a88f8cc3309..ca87a382c65 100644
--- a/security/tinyca/Makefile
+++ b/security/tinyca/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2004/12/20 22:42:22 msf Exp $
+# $OpenBSD: Makefile,v 1.2 2005/05/25 06:09:11 msf Exp $
 
 COMMENT=	"GUI to manage a certification authority"
 
-DISTNAME=	tinyca-0.6.7
+DISTNAME=	tinyca-0.6.8
 CATEGORIES=	security
 
-MAINTAINER=	Waldemar Brodkorb <wbx@openbsd.de>
+MAINTAINER=	Mathieu Sauve-Frankel <msf@openbsd.org> 
 
 HOMEPAGE=	http://tinyca.sm-zone.net/
 
diff --git a/security/tinyca/distinfo b/security/tinyca/distinfo
index 60a5abb3fe8..a589e5857c3 100644
--- a/security/tinyca/distinfo
+++ b/security/tinyca/distinfo
@@ -1,4 +1,4 @@
-MD5 (tinyca-0.6.7.tar.gz) = 4fdf13c00ea8d83b0ecf4e8256292a4d
-RMD160 (tinyca-0.6.7.tar.gz) = c9f148c01a79de7f8e24c77885f910621f023b4b
-SHA1 (tinyca-0.6.7.tar.gz) = d06312265d0c2fc722beb00da85e9bd22269e0cf
-SIZE (tinyca-0.6.7.tar.gz) = 214757
+MD5 (tinyca-0.6.8.tar.gz) = 93a9e0b733fb4dbaebf249e869eb1d96
+RMD160 (tinyca-0.6.8.tar.gz) = c53caa6bf6ad5b34d386a52365a193d609d9de5b
+SHA1 (tinyca-0.6.8.tar.gz) = f12d2068d1e02f613ab25659d959c17e6090a444
+SIZE (tinyca-0.6.8.tar.gz) = 176530
diff --git a/security/tinyca/patches/patch-lib_OpenSSL_pm b/security/tinyca/patches/patch-lib_OpenSSL_pm
new file mode 100644
index 00000000000..a83ec9a5cdc
--- /dev/null
+++ b/security/tinyca/patches/patch-lib_OpenSSL_pm
@@ -0,0 +1,28 @@
+$OpenBSD: patch-lib_OpenSSL_pm,v 1.1 2005/05/25 06:09:11 msf Exp $
+--- lib/OpenSSL.pm.orig	Tue May 24 15:30:54 2005
++++ lib/OpenSSL.pm	Tue May 24 15:41:58 2005
+@@ -479,7 +479,11 @@ sub parsecrl {
+    }
+ 
+    # get "normal infos"
+-   @lines = split(/\n/, $tmp->{'TXT'});
++   if ($tmp->{'TXT'}) {
++      @lines = split(/\n/, $tmp->{'TXT'});
++   } else {
++      @lines = ();
++   }
+    foreach(@lines) {
+       if ($_ =~ /Signature Algorithm.*: (\w+)/i) {
+          $tmp->{'SIG_ALGORITHM'} = $1;
+@@ -497,7 +501,10 @@ sub parsecrl {
+ 
+    # get revoked certs
+    $tmp->{'LIST'} = [];
+-   for($i = 0; $lines[$i] !~ /^[\s\t]*Revoked Certificates:$/i; $i++) {
++   for($i = 0; 
++       ($i < scalar(@lines)) && 
++       ($lines[$i] !~ /^[\s\t]*Revoked Certificates:$/i); 
++      $i++) {
+       $self->{'CACHE'}->{$file} = $tmp;
+       return($tmp) if ($lines[$i] =~ /No Revoked Certificates/i);
+    }
diff --git a/security/tinyca/pkg/PLIST b/security/tinyca/pkg/PLIST
index 9271258cc7c..77b9bb7480c 100644
--- a/security/tinyca/pkg/PLIST
+++ b/security/tinyca/pkg/PLIST
@@ -1,29 +1,20 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2004/12/20 22:42:22 msf Exp $
+@comment $OpenBSD: PLIST,v 1.2 2005/05/25 06:09:11 msf Exp $
 bin/tinyca
 lib/tinyca/
 lib/tinyca/CA.pm
 lib/tinyca/CERT.pm
-@comment lib/tinyca/CVS/
-@comment lib/tinyca/CVS/Entries
-@comment lib/tinyca/CVS/Repository
-@comment lib/tinyca/CVS/Root
 lib/tinyca/GUI/
 lib/tinyca/GUI.pm
 lib/tinyca/GUI/CALLBACK.pm
-lib/tinyca/GUI/CVS/
-lib/tinyca/GUI/CVS/Entries
-lib/tinyca/GUI/CVS/Repository
-lib/tinyca/GUI/CVS/Root
 lib/tinyca/GUI/HELPERS.pm
 lib/tinyca/GUI/TCONFIG.pm
 lib/tinyca/GUI/WORDS.pm
 lib/tinyca/GUI/X509_browser.pm
 lib/tinyca/GUI/X509_infobox.pm
-@comment lib/tinyca/GUI/pod2htmd.x~~
-@comment lib/tinyca/GUI/pod2htmi.x~~
 lib/tinyca/HELPERS.pm
 lib/tinyca/KEY.pm
 lib/tinyca/OpenSSL.pm
+@comment lib/tinyca/OpenSSL.pm.orig
 lib/tinyca/REQ.pm
 lib/tinyca/TCONFIG.pm
 share/tinyca/