summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--security/lasso/Makefile.common6
-rw-r--r--security/lasso/PLIST574
-rw-r--r--security/lasso/distinfo17
-rw-r--r--security/lasso/patches/patch-aa22
-rw-r--r--security/lasso/patches/patch-ba14
-rw-r--r--security/lasso/patches/patch-bb70
-rw-r--r--security/lasso/patches/patch-bc13
-rw-r--r--security/lasso/patches/patch-bd25
-rw-r--r--security/lasso/patches/patch-ca133
-rw-r--r--security/lasso/patches/patch-cb74
-rw-r--r--security/lasso/patches/patch-cc77
-rw-r--r--security/lasso/patches/patch-cd9
12 files changed, 407 insertions, 627 deletions
diff --git a/security/lasso/Makefile.common b/security/lasso/Makefile.common
index 41ad07d105e..6bb189ec5a6 100644
--- a/security/lasso/Makefile.common
+++ b/security/lasso/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.3 2009/09/23 09:54:46 tron Exp $
+# $NetBSD: Makefile.common,v 1.4 2010/05/31 16:44:28 manu Exp $
#
# used by security/lasso/Makefile
# used by security/py-lasso/Makefile
-DISTNAME= lasso-2.2.2
+DISTNAME= lasso-2.2.91
CATEGORIES= security
-MASTER_SITES= http://labs.libre-entreprise.org/frs/download.php/735/
+MASTER_SITES= http://labs.libre-entreprise.org/frs/download.php/765/
MAINTAINER= manu@NetBSD.org
HOMEPAGE= http://lasso.entrouvert.org/
diff --git a/security/lasso/PLIST b/security/lasso/PLIST
index 5a74ff2bca3..9a0eb274ff6 100644
--- a/security/lasso/PLIST
+++ b/security/lasso/PLIST
@@ -1,18 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:13:31 joerg Exp $
-share/doc/lasso/writing-a-c-sp.txt
-share/doc/lasso/writing-a-php-sp.txt
-share/doc/lasso/writing-a-java-sp.txt
-share/doc/lasso/writing-a-saml2-php-sp.txt
-share/doc/lasso/book.rst
-share/doc/lasso/common-knowledge.rst
-share/doc/lasso/getting-lasso.rst
-share/doc/lasso/integration.rst
-share/doc/lasso/language-bindings.rst
-share/doc/lasso/lasso-architecture.rst
-share/doc/lasso/liberty-architecture.rst
-share/doc/lasso/other-profiles.rst
-share/doc/lasso/preface.rst
-share/doc/lasso/single-sign-on.rst
+@comment $NetBSD: PLIST,v 1.4 2010/05/31 16:44:28 manu Exp $
lib/pkgconfig/lasso.pc
lib/liblasso.la
include/lasso/xml/saml-2.0/saml2_action.h
@@ -66,158 +52,14 @@ include/lasso/xml/saml-2.0/samlp2_status.h
include/lasso/xml/saml-2.0/samlp2_status_response.h
include/lasso/xml/saml-2.0/samlp2_subject_query_abstract.h
include/lasso/xml/saml-2.0/samlp2_terminate.h
-include/lasso/xml/id-wsf-2.0/disco_abstract.h
-include/lasso/xml/id-wsf-2.0/disco_endpoint_context.h
-include/lasso/xml/id-wsf-2.0/disco_keys.h
-include/lasso/xml/id-wsf-2.0/disco_options.h
-include/lasso/xml/id-wsf-2.0/disco_provider_id.h
-include/lasso/xml/id-wsf-2.0/disco_query.h
-include/lasso/xml/id-wsf-2.0/disco_query_response.h
-include/lasso/xml/id-wsf-2.0/disco_requested_service.h
-include/lasso/xml/id-wsf-2.0/disco_security_context.h
-include/lasso/xml/id-wsf-2.0/disco_service_context.h
-include/lasso/xml/id-wsf-2.0/disco_service_type.h
-include/lasso/xml/id-wsf-2.0/disco_svc_md_association_add.h
-include/lasso/xml/id-wsf-2.0/disco_svc_md_association_add_response.h
-include/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete.h
-include/lasso/xml/id-wsf-2.0/dst_request.h
-include/lasso/xml/id-wsf-2.0/disco_svc_md_association_delete_response.h
-include/lasso/xml/id-wsf-2.0/disco_svc_md_association_query.h
-include/lasso/xml/id-wsf-2.0/disco_svc_md_association_query_response.h
-include/lasso/xml/id-wsf-2.0/disco_svc_md_delete.h
-include/lasso/xml/id-wsf-2.0/disco_svc_md_delete_response.h
-include/lasso/xml/id-wsf-2.0/disco_svc_md_query.h
-include/lasso/xml/id-wsf-2.0/disco_svc_md_query_response.h
-include/lasso/xml/id-wsf-2.0/disco_svc_md_register.h
-include/lasso/xml/id-wsf-2.0/disco_svc_md_register_response.h
-include/lasso/xml/id-wsf-2.0/disco_svc_md_replace.h
-include/lasso/xml/id-wsf-2.0/disco_svc_md_replace_response.h
-include/lasso/xml/id-wsf-2.0/disco_svc_metadata.h
-include/lasso/xml/id-wsf-2.0/dst_data_response_base.h
-include/lasso/xml/id-wsf-2.0/dst_delete_item_base.h
-include/lasso/xml/id-wsf-2.0/dst_delete_response.h
-include/lasso/xml/id-wsf-2.0/dst_result_query_base.h
-include/lasso/xml/id-wsf-2.0/dst_test_item_base.h
-include/lasso/xml/id-wsf-2.0/dstref_app_data.h
-include/lasso/xml/id-wsf-2.0/dstref_create.h
-include/lasso/xml/id-wsf-2.0/dstref_create_item.h
-include/lasso/xml/id-wsf-2.0/dstref_create_response.h
-include/lasso/xml/id-wsf-2.0/dstref_data.h
-include/lasso/xml/id-wsf-2.0/dstref_data_response.h
-include/lasso/xml/id-wsf-2.0/dstref_delete.h
-include/lasso/xml/id-wsf-2.0/dstref_delete_item.h
-include/lasso/xml/id-wsf-2.0/dstref_delete_response.h
-include/lasso/xml/id-wsf-2.0/dstref_item_data.h
-include/lasso/xml/id-wsf-2.0/dstref_modify.h
-include/lasso/xml/id-wsf-2.0/dstref_modify_item.h
-include/lasso/xml/id-wsf-2.0/dstref_query.h
-include/lasso/xml/id-wsf-2.0/dstref_modify_response.h
-include/lasso/xml/id-wsf-2.0/dstref_query_item.h
-include/lasso/xml/id-wsf-2.0/dstref_query_response.h
-include/lasso/xml/id-wsf-2.0/dstref_result_query.h
-include/lasso/xml/id-wsf-2.0/dstref_test_item.h
-include/lasso/xml/id-wsf-2.0/ims_identity_mapping_request.h
-include/lasso/xml/id-wsf-2.0/ims_identity_mapping_response.h
-include/lasso/xml/id-wsf-2.0/ims_mapping_input.h
-include/lasso/xml/id-wsf-2.0/ims_mapping_output.h
-include/lasso/xml/id-wsf-2.0/is_help.h
-include/lasso/xml/id-wsf-2.0/is_inquiry.h
-include/lasso/xml/id-wsf-2.0/is_inquiry_element.h
-include/lasso/xml/id-wsf-2.0/is_interaction_request.h
-include/lasso/xml/id-wsf-2.0/is_interaction_response.h
-include/lasso/xml/id-wsf-2.0/is_interaction_statement.h
-include/lasso/xml/id-wsf-2.0/is_item.h
-include/lasso/xml/id-wsf-2.0/is_parameter.h
-include/lasso/xml/id-wsf-2.0/is_select.h
-include/lasso/xml/id-wsf-2.0/is_text.h
-include/lasso/xml/id-wsf-2.0/ps_add_collection_request.h
-include/lasso/xml/id-wsf-2.0/ps_add_collection_response.h
-include/lasso/xml/id-wsf-2.0/ps_add_entity_request.h
-include/lasso/xml/id-wsf-2.0/ps_add_entity_response.h
-include/lasso/xml/id-wsf-2.0/ps_add_known_entity_request.h
-include/lasso/xml/id-wsf-2.0/ps_add_known_entity_response.h
-include/lasso/xml/id-wsf-2.0/ps_add_to_collection_request.h
-include/lasso/xml/id-wsf-2.0/ps_get_object_info_request.h
-include/lasso/xml/id-wsf-2.0/ps_get_object_info_response.h
-include/lasso/xml/id-wsf-2.0/ps_item_data.h
-include/lasso/xml/id-wsf-2.0/ps_list_members_request.h
-include/lasso/xml/id-wsf-2.0/ps_list_members_response.h
-include/lasso/xml/id-wsf-2.0/ps_notification.h
-include/lasso/xml/id-wsf-2.0/ps_notify.h
-include/lasso/xml/id-wsf-2.0/ps_object.h
-include/lasso/xml/id-wsf-2.0/ps_query_objects_request.h
-include/lasso/xml/id-wsf-2.0/ps_query_objects_response.h
-include/lasso/xml/id-wsf-2.0/ps_remove_collection_request.h
-include/lasso/xml/id-wsf-2.0/ps_remove_entity_request.h
-include/lasso/xml/id-wsf-2.0/ps_remove_from_collection_request.h
-include/lasso/xml/id-wsf-2.0/ps_request_abstract.h
-include/lasso/xml/id-wsf-2.0/ps_resolve_identifier_request.h
-include/lasso/xml/id-wsf-2.0/ps_resolve_identifier_response.h
-include/lasso/xml/id-wsf-2.0/ps_resolve_input.h
-include/lasso/xml/id-wsf-2.0/ps_response_abstract.h
-include/lasso/xml/id-wsf-2.0/ps_set_object_info_request.h
-include/lasso/xml/id-wsf-2.0/sb2_consent.h
-include/lasso/xml/id-wsf-2.0/ps_test_membership_request.h
-include/lasso/xml/id-wsf-2.0/ps_test_membership_response.h
-include/lasso/xml/id-wsf-2.0/sb2_credentials_context.h
-include/lasso/xml/id-wsf-2.0/sb2_endpoint_update.h
-include/lasso/xml/id-wsf-2.0/sb2_redirect_request.h
-include/lasso/xml/id-wsf-2.0/sb2_sender.h
-include/lasso/xml/id-wsf-2.0/sb2_target_identity.h
-include/lasso/xml/id-wsf-2.0/sb2_timeout.h
-include/lasso/xml/id-wsf-2.0/sb2_usage_directive.h
-include/lasso/xml/id-wsf-2.0/sb2_user_interaction_header.h
-include/lasso/xml/id-wsf-2.0/sbf_framework.h
-include/lasso/xml/id-wsf-2.0/sec_token.h
-include/lasso/xml/id-wsf-2.0/sec_token_policy.h
-include/lasso/xml/id-wsf-2.0/sec_transited_provider_path.h
-include/lasso/xml/id-wsf-2.0/subs_notification.h
-include/lasso/xml/id-wsf-2.0/subs_notify_response.h
-include/lasso/xml/id-wsf-2.0/subs_ref_item.h
-include/lasso/xml/id-wsf-2.0/subs_subscription.h
-include/lasso/xml/id-wsf-2.0/subsref_app_data.h
-include/lasso/xml/id-wsf-2.0/subsref_create.h
-include/lasso/xml/id-wsf-2.0/subsref_create_item.h
-include/lasso/xml/id-wsf-2.0/subsref_create_response.h
-include/lasso/xml/id-wsf-2.0/subsref_data.h
-include/lasso/xml/id-wsf-2.0/subsref_data_response.h
-include/lasso/xml/id-wsf-2.0/subsref_delete.h
-include/lasso/xml/id-wsf-2.0/subsref_delete_item.h
-include/lasso/xml/id-wsf-2.0/subsref_delete_response.h
-include/lasso/xml/id-wsf-2.0/subsref_item_data.h
-include/lasso/xml/id-wsf-2.0/subsref_modify.h
-include/lasso/xml/id-wsf-2.0/subsref_modify_item.h
-include/lasso/xml/id-wsf-2.0/subsref_modify_response.h
-include/lasso/xml/id-wsf-2.0/subsref_notification.h
-include/lasso/xml/id-wsf-2.0/subsref_notify.h
-include/lasso/xml/id-wsf-2.0/subsref_notify_response.h
-include/lasso/xml/id-wsf-2.0/subsref_query.h
-include/lasso/xml/id-wsf-2.0/subsref_query_item.h
-include/lasso/xml/id-wsf-2.0/subsref_query_response.h
-include/lasso/xml/id-wsf-2.0/subsref_result_query.h
-include/lasso/xml/id-wsf-2.0/subsref_subscription.h
-include/lasso/xml/id-wsf-2.0/subsref_test_item.h
-include/lasso/xml/id-wsf-2.0/util_empty.h
-include/lasso/xml/id-wsf-2.0/util_extension.h
-include/lasso/xml/id-wsf-2.0/util_response.h
-include/lasso/xml/id-wsf-2.0/util_status.h
-include/lasso/xml/ws/wsa_attributed_any.h
-include/lasso/xml/ws/wsa_attributed_qname.h
-include/lasso/xml/ws/wsa_attributed_unsigned_long.h
-include/lasso/xml/ws/wsa_attributed_uri.h
-include/lasso/xml/ws/wsa_endpoint_reference.h
-include/lasso/xml/ws/wsa_metadata.h
-include/lasso/xml/ws/wsa_problem_action.h
-include/lasso/xml/ws/wsa_reference_parameters.h
-include/lasso/xml/ws/wsa_relates_to.h
-include/lasso/xml/ws/wsse_embedded.h
-include/lasso/xml/ws/wsse_reference.h
-include/lasso/xml/ws/wsse_security_header.h
-include/lasso/xml/ws/wsse_security_token_reference.h
-include/lasso/xml/ws/wsse_transformation_parameters.h
-include/lasso/xml/ws/wsu_timestamp.h
-include/lasso/xml/ws/wsse_username_token.h
+include/lasso/xml/soap-1.1/soap_body.h
+include/lasso/xml/soap-1.1/soap_detail.h
+include/lasso/xml/soap-1.1/soap_fault.h
+include/lasso/xml/soap-1.1/soap_envelope.h
+include/lasso/xml/soap-1.1/soap_header.h
+include/lasso/xml/soap-1.1/xml_soap11.h
include/lasso/xml/strings.h
+include/lasso/xml/idwsf_strings.h
include/lasso/xml/xml.h
include/lasso/xml/ds_key_info.h
include/lasso/xml/ds_key_value.h
@@ -285,17 +127,401 @@ include/lasso/saml-2.0/assertion_query.h
include/lasso/saml-2.0/ecp.h
include/lasso/saml-2.0/profile.h
include/lasso/saml-2.0/name_id_management.h
-include/lasso/id-wsf-2.0/discovery.h
-include/lasso/id-wsf-2.0/data_service.h
-include/lasso/id-wsf-2.0/profile.h
-include/lasso/id-wsf-2.0/identity.h
-include/lasso/id-wsf-2.0/server.h
-include/lasso/id-wsf-2.0/session.h
+include/lasso/saml-2.0/provider.h
+include/lasso/saml-2.0/saml2_helper.h
include/lasso/export.h
include/lasso/lasso.h
include/lasso/lasso_config.h
include/lasso/errors.h
-include/lasso/debug.h
-include/lasso/registry-private.h
include/lasso/registry.h
+include/lasso/debug.h
include/lasso/utils.h
+include/lasso/registry-private.h
+share/doc/lasso/writing-a-c-sp.txt
+share/doc/lasso/writing-a-php-sp.txt
+share/doc/lasso/writing-a-java-sp.txt
+share/doc/lasso/writing-a-saml2-php-sp.txt
+share/doc/lasso/book.rst
+share/doc/lasso/common-knowledge.rst
+share/doc/lasso/getting-lasso.rst
+share/doc/lasso/integration.rst
+share/doc/lasso/language-bindings.rst
+share/doc/lasso/lasso-architecture.rst
+share/doc/lasso/liberty-architecture.rst
+share/doc/lasso/other-profiles.rst
+share/doc/lasso/preface.rst
+share/doc/lasso/single-sign-on.rst
+share/gtk-doc/html/lasso/annotation-glossary.html
+share/gtk-doc/html/lasso/api-index.html
+share/gtk-doc/html/lasso/architecture.html
+share/gtk-doc/html/lasso/home.png
+share/gtk-doc/html/lasso/idff.html
+share/gtk-doc/html/lasso/idwsf.html
+share/gtk-doc/html/lasso/idwsf2.html
+share/gtk-doc/html/lasso/index.html
+share/gtk-doc/html/lasso/index.sgml
+share/gtk-doc/html/lasso/lasso-Addon-to-SAML-2.0-profile-for-ID-WSF-2.0-bootsraping.ht
+share/gtk-doc/html/lasso/lasso-Base-Strings.html
+share/gtk-doc/html/lasso/lasso-Error-Codes.html
+share/gtk-doc/html/lasso/lasso-ID-WSF-1.0-Strings.html
+share/gtk-doc/html/lasso/lasso-Initialization-functions.html
+share/gtk-doc/html/lasso/lasso-LassoAssertionQuery.html
+share/gtk-doc/html/lasso/lasso.html
+share/gtk-doc/html/lasso/lasso-LassoAuthentication.html
+share/gtk-doc/html/lasso/lasso-LassoDataService.html
+share/gtk-doc/html/lasso/lasso-LassoDefederation.html
+share/gtk-doc/html/lasso/lasso-LassoDiscoAuthenticateRequester.html
+share/gtk-doc/html/lasso/lasso-LassoDiscoAuthenticateSessionContext.html
+share/gtk-doc/html/lasso/lasso-LassoDiscoAuthorizeRequester.html
+share/gtk-doc/html/lasso/lasso-LassoDiscoCredentials.html
+share/gtk-doc/html/lasso/lasso-LassoDiscoDescription.html
+share/gtk-doc/html/lasso/lasso-LassoDiscoEncryptResourceID.html
+share/gtk-doc/html/lasso/lasso-LassoDiscoEncryptedResourceID.html
+share/gtk-doc/html/lasso/lasso-LassoDiscoGenerateBearerToken.html
+share/gtk-doc/html/lasso/lasso-LassoDiscoInsertEntry.html
+share/gtk-doc/html/lasso/lasso-LassoDiscoModify.html
+share/gtk-doc/html/lasso/lasso-LassoDiscoModifyResponse.html
+share/gtk-doc/html/lasso/lasso-LassoDiscoOptions.html
+share/gtk-doc/html/lasso/lasso-LassoDiscoQuery.html
+share/gtk-doc/html/lasso/lasso-LassoDiscoQueryResponse.html
+share/gtk-doc/html/lasso/lasso-LassoDiscoRemoveEntry.html
+share/gtk-doc/html/lasso/lasso-LassoDiscoRequestedServiceType.html
+share/gtk-doc/html/lasso/lasso-LassoDiscoResourceID.html
+share/gtk-doc/html/lasso/lasso-LassoDiscoResourceOffering.html
+share/gtk-doc/html/lasso/lasso-LassoDiscoSendSingleLogout.html
+share/gtk-doc/html/lasso/lasso-LassoDiscovery.html
+share/gtk-doc/html/lasso/lasso-LassoDiscoServiceInstance.html
+share/gtk-doc/html/lasso/lasso-LassoDsKeyInfo.html
+share/gtk-doc/html/lasso/lasso-LassoDsKeyValue.html
+share/gtk-doc/html/lasso/lasso-LassoDsRsaKeyValue.html
+share/gtk-doc/html/lasso/lasso-LassoDstData.html
+share/gtk-doc/html/lasso/lasso-LassoDstModification.html
+share/gtk-doc/html/lasso/lasso-LassoDstModify.html
+share/gtk-doc/html/lasso/lasso-LassoDstModifyResponse.html
+share/gtk-doc/html/lasso/lasso-LassoDstNewData.html
+share/gtk-doc/html/lasso/lasso-LassoDstQuery.html
+share/gtk-doc/html/lasso/lasso-LassoDstQueryItem.html
+share/gtk-doc/html/lasso/lasso-LassoDstQueryResponse.html
+share/gtk-doc/html/lasso/lasso-LassoEcp.html
+share/gtk-doc/html/lasso/up.png
+share/gtk-doc/html/lasso/lasso-LassoFederation.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DataService.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoAbstract.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoEndpointContext.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoKeys.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoProviderID.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoRequestedService.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSecurityContext.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoServiceContext.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoServiceType.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2Discovery.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDAssociationAdd.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDAssociationAddResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDAssociationDelete.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDAssociationDeleteResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDAssociationQuery.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDAssociationQueryResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDDelete.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDDeleteResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIsHelp.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDQuery.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDQueryResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDRegister.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDRegisterResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDReplace.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMDReplaceResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DiscoSvcMetadata.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstDataResponseBase.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstDeleteItemBase.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefAppData.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstDeleteResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefCreate.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefCreateItem.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefCreateResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefData.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefDataResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefDelete.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefDeleteItem.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefDeleteResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefItemData.html
+share/gtk-doc/html/lasso/lasso-LassoIsItem.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefModify.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefModifyItem.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefModifyResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefQuery.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefQueryItem.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefQueryResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefResultQuery.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefTestItem.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRequest.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstResultQueryBase.html
+share/gtk-doc/html/lasso/lasso-LassoIsText.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstTestItemBase.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2ImsIdentityMappingRequest.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2ImsIdentityMappingResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2ImsMappingInput.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2ImsMappingOutput.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2Profile.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddCollectionRequest.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddCollectionResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddEntityRequest.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsItemData.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddEntityResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddKnownEntityRequest.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddKnownEntityResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsAddToCollectionRequest.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsGetObjectInfoRequest.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsGetObjectInfoResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsListMembersRequest.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsListMembersResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsNotification.html
+share/gtk-doc/html/lasso/lasso-registry.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsNotify.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsObject.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsQueryObjectsRequest.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsQueryObjectsResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsRemoveCollectionRequest.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsRemoveEntityRequest.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsRemoveFromCollectionRequest.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsRequestAbstract.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsResolveIdentifierRequest.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsResolveInput.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsResolveIdentifierResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsResponseAbstract.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsSetObjectInfoRequest.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsTestMembershipRequest.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsTestMembershipResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2Consent.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2CredentialsContext.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2EndpointUpdate.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2RedirectRequest.html
+share/gtk-doc/html/lasso/lasso-LassoIdentity.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2Sender.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2TargetIdentity.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2Timeout.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2UsageDirective.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2Sb2UserInteractionHeader.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SbfFramework.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SecToken.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SecTokenPolicy.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SecTransitedProviderPath.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsNotification.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2UtilEmpty.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsNotifyResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefAppData.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefCreate.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefCreateItem.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefCreateResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefData.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefDataResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefDelete.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefDeleteItem.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefDeleteResponse.html
+share/gtk-doc/html/lasso/lasso.devhelp
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefItem.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefItemData.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefModify.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefModifyItem.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefModifyResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefNotification.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefNotify.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefNotifyResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefQuery.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefQueryItem.html
+share/gtk-doc/html/lasso/lasso-LassoIsInquiry.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefQueryResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefResultQuery.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefSubscription.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsRefTestItem.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2SubsSubscription.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2UtilResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2UtilStatus.html
+share/gtk-doc/html/lasso/lasso-LassoIdWsf2Utilextension.html
+share/gtk-doc/html/lasso/lasso-LassoInteractionProfileService.html
+share/gtk-doc/html/lasso/lasso-LassoIsInquiryElement.html
+share/gtk-doc/html/lasso/lasso-LassoLecp.html
+share/gtk-doc/html/lasso/lasso-LassoIsInteractionRequest.html
+share/gtk-doc/html/lasso/lasso-LassoIsInteractionResponse.html
+share/gtk-doc/html/lasso/lasso-LassoIsInteractionStatement.html
+share/gtk-doc/html/lasso/lasso-LassoIsParameter.html
+share/gtk-doc/html/lasso/lasso-LassoIsRedirectRequest.html
+share/gtk-doc/html/lasso/lasso-LassoIsSelect.html
+share/gtk-doc/html/lasso/lasso-LassoIsUserInteraction.html
+share/gtk-doc/html/lasso/lasso-LassoLibAssertion.html
+share/gtk-doc/html/lasso/lasso-LassoLibAuthenticationStatement.html
+share/gtk-doc/html/lasso/lasso-LassoLibAuthnContext.html
+share/gtk-doc/html/lasso/lasso-LassoLibAuthnRequest.html
+share/gtk-doc/html/lasso/lasso-LassoLibIDPEntry.html
+share/gtk-doc/html/lasso/lasso-LassoLibAuthnRequestEnvelope.html
+share/gtk-doc/html/lasso/lasso-LassoLibAuthnResponse.html
+share/gtk-doc/html/lasso/lasso-LassoLibAuthnResponseEnvelope.html
+share/gtk-doc/html/lasso/lasso-LassoLibFederationTerminationNotification.html
+share/gtk-doc/html/lasso/lasso-LassoLibIDPEntries.html
+share/gtk-doc/html/lasso/lasso-LassoLibIDPList.html
+share/gtk-doc/html/lasso/lasso-LassoLibLogoutRequest.html
+share/gtk-doc/html/lasso/lasso-LassoLibLogoutResponse.html
+share/gtk-doc/html/lasso/lasso-LassoLibNameIdentifierMappingRequest.html
+share/gtk-doc/html/lasso/lasso-LassoLibNameIdentifierMappingResponse.html
+share/gtk-doc/html/lasso/lasso.devhelp2
+share/gtk-doc/html/lasso/lasso-LassoLibRegisterNameIdentifierRequest.html
+share/gtk-doc/html/lasso/lasso-LassoLibRegisterNameIdentifierResponse.html
+share/gtk-doc/html/lasso/lasso-LassoLibRequestAuthnContext.html
+share/gtk-doc/html/lasso/lasso-LassoLibScoping.html
+share/gtk-doc/html/lasso/lasso-LassoLibStatusResponse.html
+share/gtk-doc/html/lasso/lasso-LassoLibSubject.html
+share/gtk-doc/html/lasso/lasso-LassoLogin.html
+share/gtk-doc/html/lasso/lasso-LassoLogout.html
+share/gtk-doc/html/lasso/lasso-LassoMiscTextNode.html
+share/gtk-doc/html/lasso/lasso-LassoNameIdManagement.html
+share/gtk-doc/html/lasso/lasso-LassoNameIdentifierMapping.html
+share/gtk-doc/html/lasso/lasso-LassoNode.html
+share/gtk-doc/html/lasso/lasso-LassoNameRegistration.html
+share/gtk-doc/html/lasso/lasso-LassoPersonalProfileService.html
+share/gtk-doc/html/lasso/lasso-LassoProfile.html
+share/gtk-doc/html/lasso/lasso-LassoProvider.html
+share/gtk-doc/html/lasso/lasso-LassoSaCredentials.html
+share/gtk-doc/html/lasso/lasso-LassoSaParameter.html
+share/gtk-doc/html/lasso/lasso-LassoSaPasswordTransforms.html
+share/gtk-doc/html/lasso/lasso-LassoSaSASLRequest.html
+share/gtk-doc/html/lasso/lasso-LassoSaSASLResponse.html
+share/gtk-doc/html/lasso/lasso-LassoSaTransform.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2Action.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2Advice.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2Assertion.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2Attribute.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2AttributeStatement.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2AttributeValue.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2AudienceRestriction.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2AuthnContext.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2AuthnStatement.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2AuthzDecisionStatement.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2BaseIDAbstract.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2ConditionAbstract.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2Conditions.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2EncryptedElement.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2Evidence.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2KeyInfoConfirmationData.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2NameID.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2OneTimeUse.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2ProxyRestriction.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2StatementAbstract.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2Subject.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2SubjectConfirmation.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2SubjectConfirmationData.html
+share/gtk-doc/html/lasso/lasso-LassoSaml2SubjectLocality.html
+share/gtk-doc/html/lasso/lasso-LassoSamlAdvice.html
+share/gtk-doc/html/lasso/lasso-LassoSamlAssertion.html
+share/gtk-doc/html/lasso/lasso-LassoSamlAttribute.html
+share/gtk-doc/html/lasso/lasso-LassoSamlAttributeDesignator.html
+share/gtk-doc/html/lasso/lasso-LassoSamlAttributeStatement.html
+share/gtk-doc/html/lasso/lasso-LassoSamlAttributeValue.html
+share/gtk-doc/html/lasso/lasso-LassoSamlAudienceRestrictionCondition.html
+share/gtk-doc/html/lasso/lasso-LassoSamlAuthenticationStatement.html
+share/gtk-doc/html/lasso/lasso-LassoSamlAuthorityBinding.html
+share/gtk-doc/html/lasso/lasso-LassoSamlConditionAbstract.html
+share/gtk-doc/html/lasso/lasso-LassoSamlConditions.html
+share/gtk-doc/html/lasso/lasso-LassoSamlNameIdentifier.html
+share/gtk-doc/html/lasso/lasso-LassoSamlStatementAbstract.html
+share/gtk-doc/html/lasso/lasso-LassoSamlSubject.html
+share/gtk-doc/html/lasso/lasso-LassoSamlSubjectConfirmation.html
+share/gtk-doc/html/lasso/lasso-LassoSamlSubjectLocality.html
+share/gtk-doc/html/lasso/lasso-LassoSamlSubjectStatement.html
+share/gtk-doc/html/lasso/lasso-LassoSamlSubjectStatementAbstract.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2ArtifactResolve.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2ArtifactResponse.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2AssertionIDRequest.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2AttributeQuery.html
+share/gtk-doc/html/lasso/lasso-LassoSamlpStatus.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2AuthnQuery.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2AuthnRequest.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2AuthzDecisionQuery.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2Extensions.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2IDPEntry.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2IDPList.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2LogoutRequest.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2LogoutResponse.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2ManageNameIDRequest.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2ManageNameIDResponse.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2NameIDMappingRequest.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2NameIDMappingResponse.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2NameIDPolicy.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2RequestAbstract.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2RequestedAuthnContext.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2Response.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2Scoping.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2Status.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2StatusCode.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2StatusDetail.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2StatusResponse.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2SubjectQueryAbstract.html
+share/gtk-doc/html/lasso/lasso-LassoSamlp2Terminate.html
+share/gtk-doc/html/lasso/lasso-LassoSamlpRequest.html
+share/gtk-doc/html/lasso/lasso-LassoSamlpRequestAbstract.html
+share/gtk-doc/html/lasso/lasso-LassoSamlpResponse.html
+share/gtk-doc/html/lasso/lasso-LassoSamlpResponseAbstract.html
+share/gtk-doc/html/lasso/lasso-LassoSamlpStatusCode.html
+share/gtk-doc/html/lasso/lasso-LassoSecResourceAccessStatement.html
+share/gtk-doc/html/lasso/lasso-LassoServer.html
+share/gtk-doc/html/lasso/lasso-LassoSession.html
+share/gtk-doc/html/lasso/lasso-LassoSoapBindingConsent.html
+share/gtk-doc/html/lasso/lasso-LassoSoapBindingCorrelation.html
+share/gtk-doc/html/lasso/lasso-LassoSoapBindingExtTimeout.html
+share/gtk-doc/html/lasso/lasso-LassoSoapBindingExtCredential.html
+share/gtk-doc/html/lasso/lasso-LassoSoapBindingExtCredentialsContext.html
+share/gtk-doc/html/lasso/lasso-LassoSoapBindingExtServiceInstanceUpdate.html
+share/gtk-doc/html/lasso/lasso-LassoSoapBindingProcessingContext.html
+share/gtk-doc/html/lasso/lasso-LassoSoapBindingProvider.html
+share/gtk-doc/html/lasso/lasso-LassoSoapBindingUsageDirective.html
+share/gtk-doc/html/lasso/lasso-LassoSoapBody.html
+share/gtk-doc/html/lasso/lasso-LassoSoapDetail.html
+share/gtk-doc/html/lasso/lasso-LassoSoapEnvelope.html
+share/gtk-doc/html/lasso/lasso-LassoSoapFault.html
+share/gtk-doc/html/lasso/lasso-LassoSoapHeader.html
+share/gtk-doc/html/lasso/lasso-LassoUtilityStatus.html
+share/gtk-doc/html/lasso/lasso-LassoWsAddrAttributedAny.html
+share/gtk-doc/html/lasso/lasso-LassoWsAddrAttributedQName.html
+share/gtk-doc/html/lasso/lasso-LassoWsAddrAttributedURI.html
+share/gtk-doc/html/lasso/lasso-LassoWsAddrAttributedUnsignedLong.html
+share/gtk-doc/html/lasso/lasso-LassoWsAddrEndpointReference.html
+share/gtk-doc/html/lasso/lasso-LassoWsAddrMetadata.html
+share/gtk-doc/html/lasso/lasso-LassoWsAddrProblemAction.html
+share/gtk-doc/html/lasso/lasso-LassoWsAddrReferenceParameters.html
+share/gtk-doc/html/lasso/lasso-LassoWsAddrRelatesTo.html
+share/gtk-doc/html/lasso/lasso-LassoWsSec1Embedded.html
+share/gtk-doc/html/lasso/lasso-LassoWsSec1Reference.html
+share/gtk-doc/html/lasso/lasso-LassoWsSec1SecurityHeader.html
+share/gtk-doc/html/lasso/lasso-LassoWsSec1SecurityTokenReference.html
+share/gtk-doc/html/lasso/lasso-LassoWsSec1TransformationParameters.html
+share/gtk-doc/html/lasso/lasso-LassoWsUtil1Timestamp.html
+share/gtk-doc/html/lasso/lasso-LassoWsfProfile.html
+share/gtk-doc/html/lasso/lasso-LassoWsseUsernameToken.html
+share/gtk-doc/html/lasso/lasso-SAML-2.0-Strings.html
+share/gtk-doc/html/lasso/lasso-SOAP-Binding-utility-function-for-ID-WSF-2.0.html
+share/gtk-doc/html/lasso/lasso-Strings-for-ID-FF-1.2.html
+share/gtk-doc/html/lasso/lasso-Strings-for-ID-WSF-2.0.html
+share/gtk-doc/html/lasso/lasso-Strings-for-SOAP.html
+share/gtk-doc/html/lasso/lasso-Strings-for-WS-*.html
+share/gtk-doc/html/lasso/lasso-Strings-for-XML-DSIG.html
+share/gtk-doc/html/lasso/lasso-Utility-functions-for-ID-WSF-1.0.html
+share/gtk-doc/html/lasso/lasso-Utility-functions-for-SAML-2.0.html
+share/gtk-doc/html/lasso/left.png
+share/gtk-doc/html/lasso/pt01.html
+share/gtk-doc/html/lasso/right.png
+share/gtk-doc/html/lasso/rn01.html
+share/gtk-doc/html/lasso/saml2.html
+share/gtk-doc/html/lasso/soap.html
+share/gtk-doc/html/lasso/style.css
+share/gtk-doc/html/lasso/ws-addr.html
+share/gtk-doc/html/lasso/xml-dsig.html
+share/gtk-doc/html/lasso/xml-idff.html
+share/gtk-doc/html/lasso/xml-idwsf.html
+share/gtk-doc/html/lasso/xml-idwsf2.html
+share/gtk-doc/html/lasso/xml-samlv2.html
+@dirrm include/lasso/xml
+@dirrm include/lasso/xml/saml-2.0
+@dirrm include/lasso/xml/soap-1.1
+@dirrm include/lasso/id-ff
+@dirrm include/lasso/saml-2.0
+@dirrm include/lasso
+@dirrm share/doc/lasso
+@dirrm share/gtk-doc/html/lasso
diff --git a/security/lasso/distinfo b/security/lasso/distinfo
index ab9d5638104..bee6ba9518a 100644
--- a/security/lasso/distinfo
+++ b/security/lasso/distinfo
@@ -1,14 +1,5 @@
-$NetBSD: distinfo,v 1.6 2009/12/01 08:49:46 manu Exp $
+$NetBSD: distinfo,v 1.7 2010/05/31 16:44:28 manu Exp $
-SHA1 (lasso-2.2.2.tar.gz) = 32651fa71b16da01a94db234425846729a510623
-RMD160 (lasso-2.2.2.tar.gz) = a4faae605726202db33d36a2b520b0ab8f17aa76
-Size (lasso-2.2.2.tar.gz) = 1802749 bytes
-SHA1 (patch-aa) = 965365d3aff5e1014dbe5bc7036e12837ccfc185
-SHA1 (patch-ba) = 4ebb013f1c264e5b0008faeebdecc7bdb49be63a
-SHA1 (patch-bb) = 0867b8ae4036620084b73d28546ac089b57d3fb9
-SHA1 (patch-bc) = 1633e47d0b4db574183bc3798a2dd839c98d11cb
-SHA1 (patch-bd) = d6788200b7f7a871b8d5bb788c5feff174c2a371
-SHA1 (patch-ca) = d65ec7dcf14db7be4abf0d804e666768d0cb81d5
-SHA1 (patch-cb) = 181213f32003c2744e40c45d24fa30198444e0af
-SHA1 (patch-cc) = 71794a4f081bafd451528f11b06fb61997ff4f9f
-SHA1 (patch-cd) = 6dfacf5eb7308ad78609e3c8412422b98cb891d4
+SHA1 (lasso-2.2.91.tar.gz) = 22f8e22938cea9c77abbac763c9bb698e1c44cc8
+RMD160 (lasso-2.2.91.tar.gz) = bcbc1d293a9e9bcf45ca9a09d103de9e640b625a
+Size (lasso-2.2.91.tar.gz) = 1919703 bytes
diff --git a/security/lasso/patches/patch-aa b/security/lasso/patches/patch-aa
deleted file mode 100644
index f7dd6012743..00000000000
--- a/security/lasso/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2009/07/06 22:01:34 joerg Exp $
-
---- lasso/registry.c.orig 2010-05-31 15:45:21.000000000 +0200
-+++ lasso/registry.c
-@@ -116,7 +116,7 @@ guint lasso_registry_direct_mapping_hash
- {
- return g_direct_hash((void*)(record->from_namespace
- ^ record->from_name
-- ^ record->to_namespace));
-+ ^ (size_t)record->to_namespace));
- }
-
- /**
-@@ -129,7 +129,7 @@ guint lasso_registry_direct_mapping_hash
- */
- guint lasso_registry_functional_mapping_hash(LassoRegistryFunctionalMappingRecord *record)
- {
-- return g_direct_hash((void*)(record->from_namespace ^ record->to_namespace));
-+ return g_direct_hash((void*)(record->from_namespace ^ (size_t)record->to_namespace));
- }
-
- /**
diff --git a/security/lasso/patches/patch-ba b/security/lasso/patches/patch-ba
deleted file mode 100644
index acc47a0c18e..00000000000
--- a/security/lasso/patches/patch-ba
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ba,v 1.2 2009/04/09 03:23:55 manu Exp $
---- configure.ac.orig 2008-07-22 12:46:24.000000000 +0000
-+++ configure.ac 2009-03-01 06:41:53.000000000 +0000
-@@ -791,9 +791,9 @@
- if test "z$PKG_CONFIG_PATH" != "z"; then
- export PKG_CONFIG_PATH
- fi
-
--PKG_CHECK_MODULES(LASSO, glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl)
-+PKG_CHECK_MODULES(LASSO, glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6)
-
- AC_ARG_WITH(sasl2, [ --with-sasl2[=PFX] Use Cyrus SASL library version 2 for WSF-Auth])
- if test "x$enable_wsf" = "xyes"; then
- if test "$with_sasl2" != "no" && test "$with_sasl2" != "yes"
diff --git a/security/lasso/patches/patch-bb b/security/lasso/patches/patch-bb
deleted file mode 100644
index 388bdcf2c3e..00000000000
--- a/security/lasso/patches/patch-bb
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-bb,v 1.3 2009/05/26 05:26:00 manu Exp $
---- configure.orig 2009-04-05 09:25:04.000000000 +0200
-+++ configure 2009-04-05 09:25:48.000000000 +0200
-@@ -15388,14 +15388,14 @@
- if test -n "$LASSO_CFLAGS"; then
- pkg_cv_LASSO_CFLAGS="$LASSO_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl\"") >&5
-- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl") 2>&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_LASSO_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl" 2>/dev/null`
-+ pkg_cv_LASSO_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6" 2>/dev/null`
- else
- pkg_failed=yes
- fi
- fi
-@@ -15406,14 +15406,14 @@
- if test -n "$LASSO_LIBS"; then
- pkg_cv_LASSO_LIBS="$LASSO_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl\"") >&5
-- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl") 2>&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_LASSO_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl" 2>/dev/null`
-+ pkg_cv_LASSO_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6" 2>/dev/null`
- else
- pkg_failed=yes
- fi
- fi
-@@ -15430,16 +15430,16 @@
- else
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- LASSO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl"`
-+ LASSO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6"`
- else
-- LASSO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl"`
-+ LASSO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$LASSO_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl) were not met:
-+ { { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6) were not met:
-
- $LASSO_PKG_ERRORS
-
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
-@@ -15448,9 +15448,9 @@
- Alternatively, you may set the environment variables LASSO_CFLAGS
- and LASSO_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl) were not met:
-+$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6) were not met:
-
- $LASSO_PKG_ERRORS
-
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
diff --git a/security/lasso/patches/patch-bc b/security/lasso/patches/patch-bc
deleted file mode 100644
index 45b1ac7cc80..00000000000
--- a/security/lasso/patches/patch-bc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bc,v 1.3 2009/07/06 22:01:34 joerg Exp $
-
---- lasso/xml/tools.c.orig 2009-03-27 17:12:48.000000000 +0100
-+++ lasso/xml/tools.c
-@@ -1210,7 +1210,7 @@ is_base64(const char *message)
- const char *c;
-
- c = message;
-- while (*c != 0 && (isalnum(*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++;
-+ while (*c != 0 && (isalnum((unsigned char)*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++;
- while (*c == '=' || *c == '\n' || *c == '\r') c++; /* trailing = */
-
- if (*c == 0)
diff --git a/security/lasso/patches/patch-bd b/security/lasso/patches/patch-bd
deleted file mode 100644
index ce3d6879426..00000000000
--- a/security/lasso/patches/patch-bd
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-bd,v 1.3 2009/07/06 22:01:34 joerg Exp $
-
---- lasso/xml/xml.c.orig 2009-03-27 17:12:48.000000000 +0100
-+++ lasso/xml/xml.c
-@@ -1554,8 +1554,9 @@ lasso_node_new_from_xmlNode(xmlNode *xml
- }
- }
- }
--
-- node = lasso_node_new_from_xmlNode_with_type(xmlnode, typename);
-+ if (typename) {
-+ node = lasso_node_new_from_xmlNode_with_type(xmlnode, typename);
-+ }
- lasso_release(typename);
-
- return node;
-@@ -1592,7 +1593,7 @@ is_base64(const char *message)
- const char *c;
-
- c = message;
-- while (*c != 0 && (isalnum(*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++;
-+ while (*c != 0 && (isalnum((unsigned char)*c) || *c == '+' || *c == '/' || *c == '\n' || *c == '\r')) c++;
- while (*c == '=' || *c == '\n' || *c == '\r') c++; /* trailing = */
-
- if (*c == 0)
diff --git a/security/lasso/patches/patch-ca b/security/lasso/patches/patch-ca
deleted file mode 100644
index 8592d58baae..00000000000
--- a/security/lasso/patches/patch-ca
+++ /dev/null
@@ -1,133 +0,0 @@
-$NetBSD: patch-ca,v 1.2 2009/12/01 08:49:46 manu Exp $
---- lasso/saml-2.0/profile.c.orig 2009-03-27 17:12:48.000000000 +0100
-+++ lasso/saml-2.0/profile.c 2009-11-30 20:19:47.000000000 +0100
-@@ -49,5 +49,5 @@
- static char* lasso_saml20_profile_build_artifact(LassoProvider *provider);
- static void remove_all_signatures(LassoNode *node);
--static char * lasso_saml20_profile_export_to_query(LassoProfile *profile, LassoNode *msg, int sign);
-+static int lasso_saml20_profile_export_to_query(LassoProfile *profile, LassoNode *msg, int sign, char **query);
-
- /*
-@@ -1014,36 +1014,41 @@
- * Return value: a newly allocated string containing the query string if successfull, NULL otherwise.
- */
--static char *
--lasso_saml20_profile_export_to_query(LassoProfile *profile, LassoNode *msg, int sign) {
-+static int
-+lasso_saml20_profile_export_to_query(LassoProfile *profile, LassoNode *msg, int sign, char **query) {
- char *unsigned_query = NULL;
- char *result = NULL;
-+ int rc = 0;
-
-- g_return_val_if_fail(LASSO_IS_NODE(msg), NULL);
-+ lasso_bad_param(PROFILE, profile);
-+ lasso_bad_param(NODE, msg);
-
- unsigned_query = lasso_node_build_query(msg);
- if (profile->msg_relayState) {
-- char *query = unsigned_query;
-- xmlChar *encoded_relayState;
-- if (strlen(profile->msg_relayState) < 81) {
-- encoded_relayState = xmlURIEscape((xmlChar*)profile->msg_relayState);
-- if (encoded_relayState != NULL) {
-- unsigned_query = g_strdup_printf("%s&RelayState=%s", query,
-- (char*)encoded_relayState);
-- lasso_release_string(query);
-- lasso_release_xml_string(encoded_relayState);
-- }
-- } else {
-- g_warning("Refused to encode a RelayState of more than 80 bytes, #3.4.3 of"
-- " saml-bindings-2.0-os");
-+ unsigned_query = lasso_url_add_parameters(unsigned_query, 1, "RelayState", profile->msg_relayState, NULL);
-+
-+ if (strlen(profile->msg_relayState) > 80) {
-+ g_warning("Encoded a RelayState of more than 80 bytes, see #3.4.3 of saml-bindings-2.0-os");
- }
- }
- if (sign && lasso_flag_add_signature) {
-+ LassoServer *server = profile->server;
-+ goto_cleanup_if_fail_with_rc (LASSO_IS_SERVER(server),
-+ LASSO_PROFILE_ERROR_MISSING_SERVER);
-+ goto_cleanup_if_fail_with_rc (
-+ profile->server->signature_method != LASSO_SIGNATURE_TYPE_NONE &&
-+ profile->server->private_key,
-+ LASSO_DS_ERROR_PRIVATE_KEY_LOAD_FAILED);
-+
- result = lasso_query_sign(unsigned_query, profile->server->signature_method,
- profile->server->private_key);
-- lasso_release_string(unsigned_query);
-+ lasso_transfer_string(*query, result);
- } else {
-- result = unsigned_query;
-+ lasso_transfer_string(*query, unsigned_query);
- }
-- return result;
-+cleanup:
-+ lasso_release_string(unsigned_query);
-+ lasso_release_string(result);
-+ return rc;
-+
- }
-
-@@ -1054,8 +1059,13 @@
- if (node == NULL)
- return;
-+
- klass = LASSO_NODE_GET_CLASS(node);
-- if (klass->node_data->sign_type_offset != 0) {
-- G_STRUCT_MEMBER(LassoSignatureType, node,klass->node_data->sign_type_offset) =
-- LASSO_SIGNATURE_TYPE_NONE;
-+ /* follow the class parenting chain */
-+ while (klass && LASSO_IS_NODE_CLASS(klass)) {
-+ if (klass && klass->node_data && klass->node_data->sign_type_offset != 0) {
-+ G_STRUCT_MEMBER(LassoSignatureType, node, klass->node_data->sign_type_offset) =
-+ LASSO_SIGNATURE_TYPE_NONE;
-+ }
-+ klass = g_type_class_peek_parent(klass);
- }
- }
-@@ -1097,4 +1107,17 @@
- }
-
-+/**
-+ * lasso_saml20_profile_build_http_redirect:
-+ * @profile: a #LassoProfile object
-+ * @msg: a #LassoNode object representing a SAML 2.0 message
-+ * @must_sign: wheter to sign the query message using query signatures
-+ * @url: the URL where the query is targeted
-+ *
-+ * Build an HTTP URL with a query-string following the SAML 2.0 HTTP-Redirect binding rules,
-+ * eventually sign it. Any signature at the message level is removed.
-+ *
-+ * Return value: 0 if successful, an error code otherwise.
-+ */
-+
- gint
- lasso_saml20_profile_build_http_redirect(LassoProfile *profile,
-@@ -1103,12 +1126,17 @@
- const char *url)
- {
-- char *query;
-+ char *query = NULL;
-+ int rc = 0;
-
- if (url == NULL) {
- return critical_error(LASSO_PROFILE_ERROR_UNKNOWN_PROFILE_URL);
- }
-+ /* remove XML signature */
-+ remove_signature(msg);
- /* No signature on the XML message */
-- remove_all_signatures(msg);
-- query = lasso_saml20_profile_export_to_query(profile, msg, must_sign);
-+ rc = lasso_saml20_profile_export_to_query(profile, msg, must_sign, &query);
-+ if (rc)
-+ return rc;
-+
- lasso_assign_new_string(profile->msg_url, lasso_concat_url_query(url, query));
- lasso_release(profile->msg_body);
-@@ -1317,4 +1345,5 @@
- lasso_release(idx);
- }
-+ /* remove signature at the message level */
- rc = lasso_saml20_profile_build_http_redirect(profile, msg, must_sign, url);
- lasso_release(url);
diff --git a/security/lasso/patches/patch-cb b/security/lasso/patches/patch-cb
deleted file mode 100644
index 7f91cc07faf..00000000000
--- a/security/lasso/patches/patch-cb
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-cb,v 1.3 2009/12/01 08:49:46 manu Exp $
---- lasso/xml/tools.c.orig 2009-11-30 18:38:05.000000000 +0100
-+++ lasso/xml/tools.c 2009-11-30 18:39:45.000000000 +0100
-@@ -1492,2 +1492,70 @@
- return result;
- }
-+
-+
-+/**
-+ * lasso_url_add_parameters:
-+ * @url: the original URL
-+ * @free: whether to free the URL parameter
-+ * @...: pairs of strings, key, value, followed by NULL
-+ *
-+ * Iterate over all pairs of key,value, and concatenate them to @url encoded as "&key=value", where
-+ * key and value are url-encoded.
-+ * If free is true and at least one pair was given, url is freed. If url is NULL, the first
-+ * ampersand is omitted.
-+ *
-+ * Return value: a newly allocated string, or url.
-+ */
-+char*
-+lasso_url_add_parameters(char *url,
-+ gboolean free, ...)
-+{
-+ char *old_url = url, *new_url;
-+ xmlChar *encoded_key, *encoded_value;
-+ int rc = 0;
-+ va_list ap;
-+
-+ va_start(ap, free);
-+
-+ while (1) {
-+ char *key;
-+ char *value;
-+
-+ key = va_arg(ap, char*);
-+ if (! key) {
-+ break;
-+ }
-+ encoded_key = xmlURIEscapeStr((xmlChar*)key, NULL);
-+ goto_cleanup_if_fail_with_rc(encoded_key, 0);
-+
-+ value = va_arg(ap, char*);
-+ if (! value) {
-+ message(G_LOG_LEVEL_CRITICAL, "lasso_url_add_parameter: key without a value !!");
-+ break;
-+ }
-+ encoded_value = xmlURIEscapeStr((xmlChar*)value, NULL);
-+ goto_cleanup_if_fail_with_rc(encoded_value, 0);
-+
-+ if (old_url) {
-+ new_url = g_strdup_printf("%s&%s=%s", old_url, (char*)encoded_key, (char*)encoded_value);
-+ } else {
-+ new_url = g_strdup_printf("%s=%s", (char*)encoded_key, (char*)encoded_value);
-+ }
-+ if (old_url != url) {
-+ lasso_release_string(old_url);
-+ }
-+ old_url = new_url;
-+
-+ lasso_release_xml_string(encoded_key);
-+ lasso_release_xml_string(encoded_value);
-+ }
-+cleanup:
-+ va_end(ap);
-+ if (free && new_url != url) {
-+ lasso_release(url);
-+ }
-+ lasso_release_xml_string(encoded_key);
-+
-+ return new_url;
-+}
-+
diff --git a/security/lasso/patches/patch-cc b/security/lasso/patches/patch-cc
deleted file mode 100644
index c6466cda4db..00000000000
--- a/security/lasso/patches/patch-cc
+++ /dev/null
@@ -1,77 +0,0 @@
-$NetBSD: patch-cc,v 1.1 2009/12/01 08:49:46 manu Exp $
---- lasso/utils.h.orig 2009-11-30 18:54:46.000000000 +0100
-+++ lasso/utils.h 2009-11-30 19:31:22.000000000 +0100
-@@ -336,4 +336,73 @@
- g_return_val_if_fail(name != NULL, LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ);
-
-+/**
-+ * The following macros are made to create some formalism for function's cleanup code.
-+ *
-+ * The exit label should be called 'cleanup'. And for functions returning an integer error code, the
-+ * error code should be named 'rc' and 'return rc;' should be the last statement of the function.
-+ */
-+
-+/**
-+ * goto_cleanup_with_rc:
-+ * @rc_value: integer return value
-+ *
-+ * This macro jump to the 'cleanup' label and set the return value to @rc_value.
-+ *
-+ */
-+#define goto_cleanup_with_rc(rc_value) \
-+ {\
-+ rc = (rc_value); \
-+ goto cleanup; \
-+ }
-+
-+/**
-+ * goto_cleanup_if_fail:
-+ * @condition: a boolean condition
-+ *
-+ * Jump to the 'cleanup' label if the @condition is FALSE.
-+ *
-+ */
-+#define goto_cleanup_if_fail(condition) \
-+ {\
-+ if (! (condition) ) {\
-+ goto cleanup; \
-+ } \
-+ }
-+
-+/**
-+ * goto_cleanup_if_fail_with_rc:
-+ * @condition: a boolean condition
-+ * @rc_value: integer return value
-+ *
-+ * Jump to the 'cleanup' label if the @condition is FALSE and set the return value to
-+ * @rc_value.
-+ *
-+ */
-+#define goto_cleanup_if_fail_with_rc(condition, rc_value) \
-+ {\
-+ if (! (condition) ) {\
-+ rc = (rc_value); \
-+ goto cleanup; \
-+ } \
-+ }
-+
-+/**
-+ * goto_cleanup_if_fail_with_rc_with_warning:
-+ * @condition: a boolean condition
-+ * @rc_value: integer return value
-+ *
-+ * Jump to the 'cleanup' label if the @condition is FALSE and set the return value to
-+ * @rc_value. Also emit a warning, showing the condition and the return value.
-+ *
-+ */
-+#define goto_cleanup_if_fail_with_rc_with_warning(condition, rc_value) \
-+ {\
-+ if (! (condition) ) {\
-+ g_warning("%s failed, returning %s", __STRING(condition), __STRING(rc_value));\
-+ rc = (rc_value); \
-+ goto cleanup; \
-+ } \
-+ }
-+
- #define goto_exit_with_rc(rc_value) \
- {\
diff --git a/security/lasso/patches/patch-cd b/security/lasso/patches/patch-cd
deleted file mode 100644
index 8b8ac3821bb..00000000000
--- a/security/lasso/patches/patch-cd
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-cd,v 1.1 2009/12/01 08:49:46 manu Exp $
---- lasso/xml/private.h.orig 2009-11-30 19:54:53.000000000 +0100
-+++ lasso/xml/private.h 2009-11-30 19:55:04.000000000 +0100
-@@ -214,4 +214,5 @@
-
- char * lasso_get_relaystate_from_query(const char *query);
-+char * lasso_url_add_parameters(char *url, gboolean free, ...);
-
- #ifdef __cplusplus