- Update to 0.0.40.

5 files changed, 63 insertions, 19 deletions

diff --git a/security/shishi/Makefile b/security/shishi/Makefile
index c5d8a6e1e2f7..a475176ad539 100644
--- a/security/shishi/Makefile
+++ b/security/shishi/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	shishi
-PORTVERSION=	0.0.22
-PORTREVISION=	5
+PORTVERSION=	0.0.40
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNU_ALPHA}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +16,8 @@ MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	A free implementation of the Kerberos 5 network security system
 
 LIB_DEPENDS=	idn.16:${PORTSDIR}/dns/libidn \
-		tasn1.4:${PORTSDIR}/security/libtasn1
+		tasn1.4:${PORTSDIR}/security/libtasn1 \
+		gcrypt.16:${PORTSDIR}/security/libgcrypt
 
 USE_AUTOTOOLS=	libtool:15
 USE_PERL5_BUILD=	yes
diff --git a/security/shishi/Makefile.man b/security/shishi/Makefile.man
index f337879bd88f..769858bc4a9b 100644
--- a/security/shishi/Makefile.man
+++ b/security/shishi/Makefile.man
@@ -1,3 +1,5 @@
+MAN1+=	ccache2shishi.1
+MAN1+=	keytab2shishi.1
 MAN1+=	shisa.1
 MAN1+=	shishi.1
 MAN1+=	shishid.1
@@ -132,10 +134,17 @@ MAN3+=	shishi_asn1_encapreppart.3
 MAN3+=	shishi_asn1_encasreppart.3
 MAN3+=	shishi_asn1_enckdcreppart.3
 MAN3+=	shishi_asn1_encprivpart.3
+MAN3+=	shishi_asn1_encrypteddata.3
 MAN3+=	shishi_asn1_encticketpart.3
+MAN3+=	shishi_asn1_etype_info.3
+MAN3+=	shishi_asn1_etype_info2.3
 MAN3+=	shishi_asn1_krberror.3
 MAN3+=	shishi_asn1_krbsafe.3
+MAN3+=	shishi_asn1_methoddata.3
 MAN3+=	shishi_asn1_msgtype.3
+MAN3+=	shishi_asn1_pa_enc_ts_enc.3
+MAN3+=	shishi_asn1_padata.3
+MAN3+=	shishi_asn1_print.3
 MAN3+=	shishi_asn1_priv.3
 MAN3+=	shishi_asn1_read.3
 MAN3+=	shishi_asn1_read_inline.3
@@ -213,6 +222,7 @@ MAN3+=	shishi_crypto.3
 MAN3+=	shishi_crypto_close.3
 MAN3+=	shishi_crypto_decrypt.3
 MAN3+=	shishi_crypto_encrypt.3
+MAN3+=	shishi_ctime.3
 MAN3+=	shishi_decrypt.3
 MAN3+=	shishi_decrypt_etype.3
 MAN3+=	shishi_decrypt_iv.3
@@ -231,15 +241,20 @@ MAN3+=	shishi_der2asn1_enckdcreppart.3
 MAN3+=	shishi_der2asn1_encprivpart.3
 MAN3+=	shishi_der2asn1_enctgsreppart.3
 MAN3+=	shishi_der2asn1_encticketpart.3
+MAN3+=	shishi_der2asn1_etype_info.3
+MAN3+=	shishi_der2asn1_etype_info2.3
 MAN3+=	shishi_der2asn1_kdcrep.3
 MAN3+=	shishi_der2asn1_kdcreq.3
 MAN3+=	shishi_der2asn1_krberror.3
 MAN3+=	shishi_der2asn1_krbsafe.3
+MAN3+=	shishi_der2asn1_methoddata.3
+MAN3+=	shishi_der2asn1_padata.3
 MAN3+=	shishi_der2asn1_priv.3
 MAN3+=	shishi_der2asn1_tgsrep.3
 MAN3+=	shishi_der2asn1_tgsreq.3
 MAN3+=	shishi_der2asn1_ticket.3
 MAN3+=	shishi_der_msgtype.3
+MAN3+=	shishi_derive_default_salt.3
 MAN3+=	shishi_des.3
 MAN3+=	shishi_des_cbc_mac.3
 MAN3+=	shishi_dk.3
@@ -261,14 +276,17 @@ MAN3+=	shishi_encapreppart_seqnumber_remove.3
 MAN3+=	shishi_encapreppart_seqnumber_set.3
 MAN3+=	shishi_encapreppart_time_copy.3
 MAN3+=	shishi_encapreppart_to_file.3
+MAN3+=	shishi_enckdcreppart_authtime_set.3
 MAN3+=	shishi_enckdcreppart_endtime_set.3
 MAN3+=	shishi_enckdcreppart_flags_set.3
 MAN3+=	shishi_enckdcreppart_get_key.3
 MAN3+=	shishi_enckdcreppart_key_set.3
 MAN3+=	shishi_enckdcreppart_nonce_set.3
 MAN3+=	shishi_enckdcreppart_populate_encticketpart.3
+MAN3+=	shishi_enckdcreppart_renew_till_set.3
 MAN3+=	shishi_enckdcreppart_sname_set.3
 MAN3+=	shishi_enckdcreppart_srealm_set.3
+MAN3+=	shishi_enckdcreppart_starttime_set.3
 MAN3+=	shishi_encprivpart_set_user_data.3
 MAN3+=	shishi_encprivpart_user_data.3
 MAN3+=	shishi_encrypt.3
@@ -330,6 +348,7 @@ MAN3+=	shishi_kdcrep_set_enc_part.3
 MAN3+=	shishi_kdcrep_set_ticket.3
 MAN3+=	shishi_kdcrep_to_file.3
 MAN3+=	shishi_kdcreq_add_padata.3
+MAN3+=	shishi_kdcreq_add_padata_preauth.3
 MAN3+=	shishi_kdcreq_add_padata_tgs.3
 MAN3+=	shishi_kdcreq_allow_postdate_p.3
 MAN3+=	shishi_kdcreq_clear_padata.3
@@ -370,6 +389,7 @@ MAN3+=	shishi_key.3
 MAN3+=	shishi_key_copy.3
 MAN3+=	shishi_key_done.3
 MAN3+=	shishi_key_from_base64.3
+MAN3+=	shishi_key_from_name.3
 MAN3+=	shishi_key_from_random.3
 MAN3+=	shishi_key_from_string.3
 MAN3+=	shishi_key_from_value.3
@@ -388,9 +408,21 @@ MAN3+=	shishi_key_value.3
 MAN3+=	shishi_key_value_set.3
 MAN3+=	shishi_key_version.3
 MAN3+=	shishi_key_version_set.3
+MAN3+=	shishi_keys.3
+MAN3+=	shishi_keys_add.3
+MAN3+=	shishi_keys_add_keytab_file.3
+MAN3+=	shishi_keys_add_keytab_mem.3
+MAN3+=	shishi_keys_done.3
 MAN3+=	shishi_keys_for_localservicerealm_in_file.3
 MAN3+=	shishi_keys_for_server_in_file.3
 MAN3+=	shishi_keys_for_serverrealm_in_file.3
+MAN3+=	shishi_keys_from_keytab_file.3
+MAN3+=	shishi_keys_from_keytab_mem.3
+MAN3+=	shishi_keys_nth.3
+MAN3+=	shishi_keys_print.3
+MAN3+=	shishi_keys_remove.3
+MAN3+=	shishi_keys_size.3
+MAN3+=	shishi_keys_to_file.3
 MAN3+=	shishi_krberror.3
 MAN3+=	shishi_krberror_build.3
 MAN3+=	shishi_krberror_client.3
@@ -409,6 +441,7 @@ MAN3+=	shishi_krberror_errorcode_set.3
 MAN3+=	shishi_krberror_etext.3
 MAN3+=	shishi_krberror_from_file.3
 MAN3+=	shishi_krberror_message.3
+MAN3+=	shishi_krberror_methoddata.3
 MAN3+=	shishi_krberror_parse.3
 MAN3+=	shishi_krberror_pretty_print.3
 MAN3+=	shishi_krberror_print.3
@@ -470,6 +503,8 @@ MAN3+=	shishi_priv_save.3
 MAN3+=	shishi_priv_set_enc_part.3
 MAN3+=	shishi_priv_to_file.3
 MAN3+=	shishi_prompt_password.3
+MAN3+=	shishi_prompt_password_callback_get.3
+MAN3+=	shishi_prompt_password_callback_set.3
 MAN3+=	shishi_random_to_key.3
 MAN3+=	shishi_randomize.3
 MAN3+=	shishi_realm_default.3
@@ -592,7 +627,12 @@ MAN3+=	shishi_tkt_valid_at_time_p.3
 MAN3+=	shishi_tkt_valid_now_p.3
 MAN3+=	shishi_tkts.3
 MAN3+=	shishi_tkts_add.3
+MAN3+=	shishi_tkts_add_ccache_file.3
+MAN3+=	shishi_tkts_add_ccache_mem.3
 MAN3+=	shishi_tkts_default.3
+MAN3+=	shishi_tkts_default_ccache.3
+MAN3+=	shishi_tkts_default_ccache_guess.3
+MAN3+=	shishi_tkts_default_ccache_set.3
 MAN3+=	shishi_tkts_default_file.3
 MAN3+=	shishi_tkts_default_file_guess.3
 MAN3+=	shishi_tkts_default_file_set.3
@@ -601,6 +641,8 @@ MAN3+=	shishi_tkts_expire.3
 MAN3+=	shishi_tkts_find.3
 MAN3+=	shishi_tkts_find_for_clientserver.3
 MAN3+=	shishi_tkts_find_for_server.3
+MAN3+=	shishi_tkts_from_ccache_file.3
+MAN3+=	shishi_tkts_from_ccache_mem.3
 MAN3+=	shishi_tkts_from_file.3
 MAN3+=	shishi_tkts_get.3
 MAN3+=	shishi_tkts_get_for_clientserver.3
@@ -616,8 +658,12 @@ MAN3+=	shishi_tkts_remove.3
 MAN3+=	shishi_tkts_size.3
 MAN3+=	shishi_tkts_to_file.3
 MAN3+=	shishi_tkts_write.3
+MAN3+=	shishi_verbose.3
 MAN3+=	shishi_verify.3
 MAN3+=	shishi_warn.3
+MAN3+=	shishi_x509ca_default_file.3
+MAN3+=	shishi_x509ca_default_file_guess.3
+MAN3+=	shishi_x509ca_default_file_set.3
 MAN3+=	shishi_x509cert_default_file.3
 MAN3+=	shishi_x509cert_default_file_guess.3
 MAN3+=	shishi_x509cert_default_file_set.3
diff --git a/security/shishi/distinfo b/security/shishi/distinfo
index b6abda30838b..a910066e4195 100644
--- a/security/shishi/distinfo
+++ b/security/shishi/distinfo
@@ -1,3 +1,3 @@
-MD5 (shishi-0.0.22.tar.gz) = f613e538ed0bb990f3644bbe5f0ab444
-SHA256 (shishi-0.0.22.tar.gz) = 630e8f3aff356a14708cdb6afe0cca3a6034c120e5d331f65680498037494e88
-SIZE (shishi-0.0.22.tar.gz) = 3229140
+MD5 (shishi-0.0.40.tar.gz) = 9935d00c1246ba7c85302e0a26902054
+SHA256 (shishi-0.0.40.tar.gz) = a07b1fbf93aabf30dd9867a8a786ec21ed5f51ef8bb37eaa2a7e5171b7919a1d
+SIZE (shishi-0.0.40.tar.gz) = 3817400
diff --git a/security/shishi/files/patch-Makefile.in b/security/shishi/files/patch-Makefile.in
deleted file mode 100644
index 1decca9771e2..000000000000
--- a/security/shishi/files/patch-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	Fri Dec 12 09:54:50 2003
-+++ Makefile.in	Wed Jan  7 15:05:57 2004
-@@ -748,7 +748,6 @@
- install-data-am: install-confDATA install-pkgconfigDATA \
- 	install-skelDATA
- 	@$(NORMAL_INSTALL)
--	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
- 
- install-exec-am:
- 
diff --git a/security/shishi/pkg-plist b/security/shishi/pkg-plist
index 93ad8a0babdf..e04ed64d72dc 100644
--- a/security/shishi/pkg-plist
+++ b/security/shishi/pkg-plist
@@ -1,8 +1,12 @@
 bin/shisa
 bin/shishi
+bin/ccache2shishi
+sbin/keytab2shishi
+sbin/shishid
 etc/shishi/shisa.conf
 etc/shishi/shishi.conf
 etc/shishi/shishi.skel
+etc/shishi/shishi.keys
 include/shisa.h
 include/shishi-int.h
 include/shishi.h
@@ -14,14 +18,18 @@ lib/libshishi.a
 lib/libshishi.la
 lib/libshishi.so
 lib/libshishi.so.0
+lib/security/pam_shishi.so
+lib/security/pam_shishi.la
+lib/security/pam_shishi.a
 libdata/pkgconfig/shishi.pc
-sbin/shishid
 %%NLS%%share/locale/en@boldquot/LC_MESSAGES/shishi.mo
 %%NLS%%share/locale/en@quot/LC_MESSAGES/shishi.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/shishi.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/shishi.mo
-@dirrmtry etc/shishi
+%%NLS%%share/locale/fr/LC_MESSAGES/shishi.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/shishi.mo
 %%NLS%%@dirrmtry share/locale/en@boldquot/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/en@boldquot
 %%NLS%%@dirrmtry share/locale/en@quot/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/en@quot
+@dirrmtry etc/shishi
+@dirrmtry lib/security