update to 0.74 based on work from jasper

This commit is contained in:
msf 2006-07-14 18:59:51 +00:00
parent ecf0b96a01
commit b3da8c812d
7 changed files with 104 additions and 115 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.2 2005/05/25 06:09:11 msf Exp $
# $OpenBSD: Makefile,v 1.3 2006/07/14 18:59:51 msf Exp $
COMMENT= "GUI to manage a certification authority"
DISTNAME= tinyca-0.6.8
DISTNAME= tinyca2-0.7.4
CATEGORIES= security
MAINTAINER= Mathieu Sauve-Frankel <msf@openbsd.org>
MAINTAINER= Mathieu Sauve-Frankel <msf@openbsd.org>
HOMEPAGE= http://tinyca.sm-zone.net/
@ -17,26 +17,36 @@ PERMIT_PACKAGE_FTP= Yes
MASTER_SITES= ${HOMEPAGE}
RUN_DEPENDS= ::x11/p5-Gtk,gnome \
BUILD_DEPENDS= ::archivers/zip \
::devel/p5-Locale-gettext \
::archivers/zip
::x11/p5-Gtk2
RUN_DEPENDS= ${BUILD_DEPENDS}
NO_REGRESS= Yes
NO_BUILD= Yes
NO_REGRESS= Yes
PKG_ARCH= *
LANGS= cs de es
do-configure:
@perl -i -pe 's#%%LOCALBASE%%#${LOCALBASE}#' ${WRKSRC}/tinyca
@perl -i -pe 's#%%PREFIX%%#${PREFIX}#' ${WRKSRC}/tinyca
@perl -i -pe 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/tinyca2
@perl -i -pe 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/tinyca2
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/tinyca ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/tinyca/templates
${INSTALL_DATA} ${WRKSRC}/templates/openssl.cnf ${PREFIX}/share/tinyca/templates
${INSTALL_DATA_DIR} ${PREFIX}/share/tinyca/locale/de/LC_MESSAGES/
@msgfmt ${WRKSRC}/po/de.po -o ${PREFIX}/share/tinyca/locale/de/LC_MESSAGES/tinyca.mo
${INSTALL_DATA_DIR} ${PREFIX}/lib/tinyca
cd ${WRKSRC}/lib; tar cf - * | tar xf - -C ${PREFIX}/lib/tinyca
${INSTALL_SCRIPT} ${WRKSRC}/tinyca2 ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/share/tinyca2/templates
${INSTALL_DATA} ${WRKSRC}/templates/openssl.cnf \
${PREFIX}/share/tinyca2/templates
.for l in ${LANGS}
${INSTALL_DATA_DIR} ${PREFIX}/share/tinyca2/locale/$l/LC_MESSAGES/
@msgfmt ${WRKSRC}/po/$l.po \
-o ${PREFIX}/share/tinyca2/locale/$l/LC_MESSAGES/tinyca2.mo
.endfor
${INSTALL_DATA_DIR} ${PREFIX}/lib/tinyca2/GUI
${INSTALL_DATA} ${WRKSRC}/lib/*.pm ${PREFIX}/lib/tinyca2
${INSTALL_DATA} ${WRKSRC}/lib/GUI/*.pm ${PREFIX}/lib/tinyca2/GUI
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
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
MD5 (tinyca2-0.7.4.tar.gz) = 3410786b7602d4c38276451ef026af08
RMD160 (tinyca2-0.7.4.tar.gz) = 094f612c5f92e0959b35df8f83c24a80dd6c7b1d
SHA1 (tinyca2-0.7.4.tar.gz) = 18d6cbece60e2898486a1e97c43abfa6065db212
SIZE (tinyca2-0.7.4.tar.gz) = 254412

View File

@ -1,28 +0,0 @@
$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);
}

View File

@ -1,39 +0,0 @@
$OpenBSD: patch-tinyca,v 1.1.1.1 2004/12/20 22:42:22 msf Exp $
--- tinyca.orig Wed Jun 16 14:55:29 2004
+++ tinyca Fri Jul 2 15:49:12 2004
@@ -18,7 +18,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
-BEGIN { push(@INC, './lib'); # put here the location of the modules
+BEGIN { push(@INC, '%%PREFIX%%/lib/tinyca'); # put here the location of the modules
}
use strict;
@@ -48,14 +48,14 @@
use TCONFIG;
setlocale(LC_MESSAGES, "");
-bindtextdomain("tinyca", "./locale/");
+bindtextdomain("tinyca", "%%PREFIX%%/share/tinyca/locale/");
textdomain("tinyca");
my $init = {};
# location of openssl
-$init->{'opensslbin'} = "/usr/bin/openssl";
-$init->{'zipbin'} = "/usr/bin/zip";
+$init->{'opensslbin'} = "/usr/sbin/openssl";
+$init->{'zipbin'} = "%%LOCALBASE%%/bin/zip";
if(not -x $init->{'opensslbin'}) {
printf(gettext("Can't execute %s.\n"), $init->{'opensslbin'});
@@ -69,7 +69,7 @@
}
# directory with the templates
-$init->{'templatedir'} = "./templates";
+$init->{'templatedir'} = "%%PREFIX%%/share/tinyca/templates";
if(not -d $init->{'templatedir'}) {
print gettext("Can't find templatedir.\n");

View File

@ -0,0 +1,41 @@
$OpenBSD: patch-tinyca2,v 1.1 2006/07/14 18:59:51 msf Exp $
--- tinyca2.orig Thu Jul 13 11:57:01 2006
+++ tinyca2 Thu Jul 13 12:03:39 2006
@@ -18,7 +18,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
-BEGIN { unshift(@INC, './lib'); # put here the location of the modules
+BEGIN { unshift(@INC, '%%PREFIX%%/lib/tinyca2'); # put here the location of the modules
}
use strict;
@@ -46,7 +46,7 @@ use KEY;
use TCONFIG;
setlocale(LC_MESSAGES, "");
-bindtextdomain("tinyca2", "./locale/");
+bindtextdomain("tinyca2", "%%PREFIX%%/share/tinyca2/locale/");
textdomain("tinyca2");
# https://bugs.gentoo.org/show_bug.cgi?id=78576
@@ -55,8 +55,8 @@ $ENV{XLIB_SKIP_ARGB_VISUALS}= '1';
my $init = {};
# location of openssl
-$init->{'opensslbin'} = "/usr/bin/openssl";
-$init->{'zipbin'} = "/usr/bin/zip";
+$init->{'opensslbin'} = "/usr/sbin/openssl";
+$init->{'zipbin'} = "%%PREFIX%%/bin/zip";
$init->{'tarbin'} = "/bin/tar";
if(not -x $init->{'opensslbin'}) {
@@ -76,7 +76,7 @@ if(not -x $init->{'zipbin'}) {
}
# directory with the templates
-$init->{'templatedir'} = "./templates";
+$init->{'templatedir'} = "%%PREFIX%%/share/tinyca2/templates";
if(not -d $init->{'templatedir'}) {
print gettext("Can't find templatedir.\n");

View File

@ -1,3 +1,3 @@
TinyCA is a simple graphical userinterface written in Perl/Gtk to manage
a small CA (Certification Authority). TinyCA works as a frontend for
OpenSSL.
TinyCA is a simple graphical userinterface written in Perl/Gtk2 to
manage a small CA (Certification Authority). TinyCA works as a frontend
for OpenSSL.

View File

@ -1,26 +1,31 @@
@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
lib/tinyca/GUI/
lib/tinyca/GUI.pm
lib/tinyca/GUI/CALLBACK.pm
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
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/
share/tinyca/locale/
share/tinyca/locale/de/
share/tinyca/locale/de/LC_MESSAGES/
share/tinyca/locale/de/LC_MESSAGES/tinyca.mo
share/tinyca/templates/
share/tinyca/templates/openssl.cnf
@comment $OpenBSD: PLIST,v 1.3 2006/07/14 18:59:51 msf Exp $
bin/tinyca2
lib/tinyca2/
lib/tinyca2/CA.pm
lib/tinyca2/CERT.pm
lib/tinyca2/GUI/
lib/tinyca2/GUI.pm
lib/tinyca2/GUI/CALLBACK.pm
lib/tinyca2/GUI/HELPERS.pm
lib/tinyca2/GUI/TCONFIG.pm
lib/tinyca2/GUI/WORDS.pm
lib/tinyca2/GUI/X509_browser.pm
lib/tinyca2/GUI/X509_infobox.pm
lib/tinyca2/HELPERS.pm
lib/tinyca2/KEY.pm
lib/tinyca2/OpenSSL.pm
lib/tinyca2/REQ.pm
lib/tinyca2/TCONFIG.pm
share/tinyca2/
share/tinyca2/locale/
share/tinyca2/locale/cs/
share/tinyca2/locale/cs/LC_MESSAGES/
share/tinyca2/locale/cs/LC_MESSAGES/tinyca2.mo
share/tinyca2/locale/de/
share/tinyca2/locale/de/LC_MESSAGES/
share/tinyca2/locale/de/LC_MESSAGES/tinyca2.mo
share/tinyca2/locale/es/
share/tinyca2/locale/es/LC_MESSAGES/
share/tinyca2/locale/es/LC_MESSAGES/tinyca2.mo
share/tinyca2/templates/
share/tinyca2/templates/openssl.cnf