diff options
18 files changed, 65 insertions, 1071 deletions
diff --git a/security/lasso/Makefile b/security/lasso/Makefile index f7778a6d15b..95dcd35fad8 100644 --- a/security/lasso/Makefile +++ b/security/lasso/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2014/05/29 23:37:19 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2015/04/01 14:05:02 manu Exp $ # -PKGREVISION= 16 +#PKGREVISION= 1 CONFIGURE_ARGS+= --disable-python CONFIGURE_ARGS+= --disable-php5 diff --git a/security/lasso/Makefile.common b/security/lasso/Makefile.common index a5f8ce033e1..75824b7b0f6 100644 --- a/security/lasso/Makefile.common +++ b/security/lasso/Makefile.common @@ -1,11 +1,11 @@ -# $NetBSD: Makefile.common,v 1.9 2014/05/09 07:37:17 wiz Exp $ +# $NetBSD: Makefile.common,v 1.10 2015/04/01 14:05:02 manu Exp $ # # used by security/lasso/Makefile # used by security/py-lasso/Makefile -DISTNAME= lasso-2.3.6 +DISTNAME= lasso-2.4.1 CATEGORIES= security -MASTER_SITES= http://dev.entrouvert.org/lasso/ +MASTER_SITES= https://dev.entrouvert.org/lasso/ MAINTAINER= manu@NetBSD.org HOMEPAGE= http://lasso.entrouvert.org/ @@ -23,8 +23,6 @@ USE_TOOLS+= pkg-config perl PKGCONFIG_OVERRIDE+= lasso.pc.in -PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 2.3.6 - .include "../../lang/python/application.mk" .include "../../security/xmlsec1/buildlink3.mk" diff --git a/security/lasso/PLIST b/security/lasso/PLIST index 06c69676d94..731b628dc95 100644 --- a/security/lasso/PLIST +++ b/security/lasso/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2012/10/23 18:16:15 manu Exp $ +@comment $NetBSD: PLIST,v 1.9 2015/04/01 14:05:02 manu Exp $ include/lasso/backward_comp.h include/lasso/ctypes.h include/lasso/debug.h @@ -16,6 +16,8 @@ include/lasso/id-ff/profile.h include/lasso/id-ff/provider.h include/lasso/id-ff/server.h include/lasso/id-ff/session.h +include/lasso/key.h +include/lasso/keyprivate.h include/lasso/lasso.h include/lasso/lasso_config.h include/lasso/logging.h @@ -28,9 +30,12 @@ include/lasso/saml-2.0/profile.h include/lasso/saml-2.0/provider.h include/lasso/saml-2.0/saml2_helper.h include/lasso/utils.h -include/lasso/xml/ds_key_info.h -include/lasso/xml/ds_key_value.h -include/lasso/xml/ds_rsa_key_value.h +include/lasso/xml/dsig/ds_key_info.h +include/lasso/xml/dsig/ds_key_value.h +include/lasso/xml/dsig/ds_rsa_key_value.h +include/lasso/xml/dsig/ds_x509_data.h +include/lasso/xml/dsig/strings.h +include/lasso/xml/dsig/xml_dsig.h include/lasso/xml/lib_assertion.h include/lasso/xml/lib_authentication_statement.h include/lasso/xml/lib_authn_context.h @@ -69,6 +74,7 @@ include/lasso/xml/saml-2.0/saml2_conditions.h include/lasso/xml/saml-2.0/saml2_encrypted_element.h include/lasso/xml/saml-2.0/saml2_evidence.h include/lasso/xml/saml-2.0/saml2_key_info_confirmation_data.h +include/lasso/xml/saml-2.0/saml2_key_info_confirmation_data_type.h include/lasso/xml/saml-2.0/saml2_name_id.h include/lasso/xml/saml-2.0/saml2_one_time_use.h include/lasso/xml/saml-2.0/saml2_proxy_restriction.h @@ -137,6 +143,7 @@ include/lasso/xml/soap-1.1/soap_fault.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/tools.h include/lasso/xml/xml.h include/lasso/xml/xml_enc.h lib/liblasso.la @@ -155,369 +162,3 @@ share/doc/lasso/writing-a-c-sp.txt share/doc/lasso/writing-a-java-sp.txt share/doc/lasso/writing-a-php-sp.txt share/doc/lasso/writing-a-saml2-php-sp.txt -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.html -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-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-LassoDiscoServiceInstance.html -share/gtk-doc/html/lasso/lasso-LassoDiscovery.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/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-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-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-LassoIdWsf2Discovery.html -share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstDataResponseBase.html -share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstDeleteItemBase.html -share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstDeleteResponse.html -share/gtk-doc/html/lasso/lasso-LassoIdWsf2DstRefAppData.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-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-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-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-LassoIdWsf2PsItemData.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-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-LassoIdWsf2PsResolveIdentifierResponse.html -share/gtk-doc/html/lasso/lasso-LassoIdWsf2PsResolveInput.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-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-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-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-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-LassoIdWsf2UtilEmpty.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-LassoIdentity.html -share/gtk-doc/html/lasso/lasso-LassoInteractionProfileService.html -share/gtk-doc/html/lasso/lasso-LassoLecp.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-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-LassoLibIDPEntry.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-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-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-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-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-LassoSamlpStatus.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-LassoSoapBindingExtCredential.html -share/gtk-doc/html/lasso/lasso-LassoSoapBindingExtCredentialsContext.html -share/gtk-doc/html/lasso/lasso-LassoSoapBindingExtServiceInstanceUpdate.html -share/gtk-doc/html/lasso/lasso-LassoSoapBindingExtTimeout.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-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/lasso-assertion-query.html -share/gtk-doc/html/lasso/lasso-authentication.html -share/gtk-doc/html/lasso/lasso-is-help.html -share/gtk-doc/html/lasso/lasso-is-inquiry-element.html -share/gtk-doc/html/lasso/lasso-is-inquiry.html -share/gtk-doc/html/lasso/lasso-is-interaction-request.html -share/gtk-doc/html/lasso/lasso-is-interaction-response.html -share/gtk-doc/html/lasso/lasso-is-interaction-statement.html -share/gtk-doc/html/lasso/lasso-is-item.html -share/gtk-doc/html/lasso/lasso-is-parameter.html -share/gtk-doc/html/lasso/lasso-is-redirect-request.html -share/gtk-doc/html/lasso/lasso-is-select.html -share/gtk-doc/html/lasso/lasso-is-text.html -share/gtk-doc/html/lasso/lasso-is-user-interaction.html -share/gtk-doc/html/lasso/lasso-login.html -share/gtk-doc/html/lasso/lasso-node.html -share/gtk-doc/html/lasso/lasso-registry.html -share/gtk-doc/html/lasso/lasso-wsse-username-token.html -share/gtk-doc/html/lasso/lasso.devhelp -share/gtk-doc/html/lasso/lasso.devhelp2 -share/gtk-doc/html/lasso/lasso.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/up.png -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 diff --git a/security/lasso/buildlink3.mk b/security/lasso/buildlink3.mk index 9df6420bff6..784207d8732 100644 --- a/security/lasso/buildlink3.mk +++ b/security/lasso/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2014/02/12 23:18:33 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2015/04/01 14:05:02 manu Exp $ BUILDLINK_TREE+= lasso @@ -6,7 +6,7 @@ BUILDLINK_TREE+= lasso LASSO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.lasso+= lasso>=2.2.1 -BUILDLINK_ABI_DEPENDS.lasso+= lasso>=2.3.6nb15 +BUILDLINK_ABI_DEPENDS.lasso+= lasso>=2.3.6nb11 BUILDLINK_PKGSRCDIR.lasso?= ../../security/lasso .include "../../security/xmlsec1/buildlink3.mk" diff --git a/security/lasso/distinfo b/security/lasso/distinfo index ac279e89c46..b0b68678b92 100644 --- a/security/lasso/distinfo +++ b/security/lasso/distinfo @@ -1,18 +1,8 @@ -$NetBSD: distinfo,v 1.15 2014/02/05 09:26:58 manu Exp $ +$NetBSD: distinfo,v 1.16 2015/04/01 14:05:02 manu Exp $ -SHA1 (lasso-2.3.6.tar.gz) = 92689a873b83e02efb4a6c3a375f040a9e75c95c -RMD160 (lasso-2.3.6.tar.gz) = 5e1aaba807d453c1fad28be6a8f06d908159b3fe -Size (lasso-2.3.6.tar.gz) = 3940027 bytes -SHA1 (patch-bindings-java-wrapper_top.c) = 16f98d5edb21ca97f05a3d108a04da8be2ec2ed4 -SHA1 (patch-bindings-php5-wrapper_source_top.c) = 21c92807633ce96188f6bbdf72129d16f5784f19 -SHA1 (patch-bindings-python-wrapper_top.c) = db730c2443e1a618f0719cd190a30a2bba241961 -SHA1 (patch-configure) = ffcd1de65b3a0e66f79200ceea0ecbad29bc89a9 -SHA1 (patch-configure.ac) = 662370c81ed8da78e614ff58cee54f825974b7ae -SHA1 (patch-docs-reference-lasso-lasso-sections.txt) = 9e6936b0c019b8fb8b9493f914241131b684cbfc -SHA1 (patch-lasso-errors_c) = 5c0fe304cd9cce6d926362c248ffe60c2c7357c5 -SHA1 (patch-lasso-errors_c_in) = d4663edb280d38a0cb1a422d9b95b1d344012f63 -SHA1 (patch-lasso-id-ff-provider.c) = 9312c67a8e81eeea95b888745a2b9f504a36a36f -SHA1 (patch-lasso-xml-tools.c) = 6ee2268747a4f84a0b9d3a53bfa260ab11ba8dfc -SHA1 (patch-lasso_id-ff_lecp.c) = 90b0d3b06a6582f779706b671c497ad7a556a116 -SHA1 (patch-lasso_id-ff_session.c) = 839277d013e219c5ba91bae1ab75cef5d99d9286 -SHA1 (patch-lasso_saml-2.0_ecp.c) = cb946f383b9d3fed4ce794deb96a143077746a2c +SHA1 (lasso-2.4.1.tar.gz) = 4596b8037932d4281828d27c3d4065522b4775dc +RMD160 (lasso-2.4.1.tar.gz) = 7fc4855135fe662b00e353ad21b0646ce24692e3 +Size (lasso-2.4.1.tar.gz) = 4392038 bytes +SHA1 (patch-configure) = 8acdd57ba89fea824ea0bc6b0080298b78226678 +SHA1 (patch-configure.ac) = 8cb6a7ad3aec9a7c17892ae4e0493ad3d6a8cde1 +SHA1 (patch-lasso-id-ff-provider.c) = 900532802b7243598332850683b3d16d3f579a82 diff --git a/security/lasso/patches/patch-bindings-java-wrapper_top.c b/security/lasso/patches/patch-bindings-java-wrapper_top.c deleted file mode 100644 index c85ba3005a5..00000000000 --- a/security/lasso/patches/patch-bindings-java-wrapper_top.c +++ /dev/null @@ -1,74 +0,0 @@ -$NetBSD: patch-bindings-java-wrapper_top.c,v 1.1 2012/10/23 18:16:15 manu Exp $ - -Patch from upstream to support libxml >= 2.9.0. From commit message: - -Libxml stopped exposing the internal of the xmlOutputBuffer structure; -it was replace by proper use of the API and of the xmlBuffer structure. - -There could be regression for older version of libxml as some functions -appeared in recent version of libxml; but the reference API document -does not give any introduction date for functions so it's hard to be -sure. - -diff --git a/bindings/java/wrapper_top.c b/bindings/java/wrapper_top.c -index dfdec34..54bdeef 100644 ---- bindings/java/wrapper_top.c -+++ bindings/java/wrapper_top.c -@@ -282,35 +282,39 @@ jstring_to_string(JNIEnv *env, jstring jstr, char **str) { - - - /* xmlNode handling */ -+static xmlBuffer* -+xmlnode_to_xmlbuffer(xmlNode *node) -+{ -+ xmlOutputBufferPtr output_buffer; -+ xmlBuffer *buffer; -+ -+ if (! node) -+ return NULL; -+ -+ buffer = xmlBufferCreate(); -+ output_buffer = xmlOutputBufferCreateBuffer(buffer, NULL); -+ xmlNodeDumpOutput(output_buffer, NULL, node, 0, 0, NULL); -+ xmlOutputBufferClose(output_buffer); -+ xmlBufferAdd(buffer, BAD_CAST "", 1); -+ -+ return buffer; -+} -+ - static int - xml_node_to_jstring(JNIEnv *env, xmlNode *xmlnode, jstring *jstr) { -- xmlOutputBufferPtr buf = NULL; -+ xmlBuffer *buffer; - - g_error_if_fail(env); - if (! xmlnode) { - *jstr = NULL; - return 1; - } -- -- buf = xmlAllocOutputBuffer(NULL); -- if (buf) { -- int ret = 1; -- xmlNodeDumpOutput(buf, NULL, xmlnode, 0, 1, NULL); -- xmlOutputBufferFlush(buf); -- xmlChar *str = NULL; -- if (buf->conv == NULL) { -- str = buf->buffer->content; -- } else { -- str = buf->conv->content; -- } -- ret = string_to_jstring(env, (char*)str, jstr); -- xmlOutputBufferClose(buf); -- return ret; -- } else { -+ buffer = xmlnode_to_xmlbuffer(xmlnode); -+ if (! buffer) { - exception(env, "could not alloc an xml output buffer"); - return 0; - } -- return 1; -+ return string_to_jstring(env, (char*)xmlBufferContent(buffer), jstr); - } - - /** Convert a java string to an xml node. Return 0 if it failed with an exception diff --git a/security/lasso/patches/patch-bindings-php5-wrapper_source_top.c b/security/lasso/patches/patch-bindings-php5-wrapper_source_top.c deleted file mode 100644 index 472dbd1bac2..00000000000 --- a/security/lasso/patches/patch-bindings-php5-wrapper_source_top.c +++ /dev/null @@ -1,74 +0,0 @@ -$NetBSD: patch-bindings-php5-wrapper_source_top.c,v 1.1 2012/10/23 18:16:15 manu Exp $ - -Patch from upstream to support libxml >= 2.9.0. From commit message: - -Libxml stopped exposing the internal of the xmlOutputBuffer structure; -it was replace by proper use of the API and of the xmlBuffer structure. - -There could be regression for older version of libxml as some functions -appeared in recent version of libxml; but the reference API document -does not give any introduction date for functions so it's hard to be -sure. - -diff --git a/bindings/php5/wrapper_source_top.c b/bindings/php5/wrapper_source_top.c -index 67a279a..0b1db97 100644 ---- bindings/php5/wrapper_source_top.c -+++ bindings/php5/wrapper_source_top.c -@@ -119,31 +119,41 @@ free_glist(GList **list, GFunc free_function) { - } - /* Conversion functions */ - -+static xmlBuffer* -+xmlnode_to_xmlbuffer(xmlNode *node) -+{ -+ xmlOutputBufferPtr output_buffer; -+ xmlBuffer *buffer; -+ -+ if (! node) -+ return NULL; -+ -+ buffer = xmlBufferCreate(); -+ output_buffer = xmlOutputBufferCreateBuffer(buffer, NULL); -+ xmlNodeDumpOutput(output_buffer, NULL, node, 0, 0, NULL); -+ xmlOutputBufferClose(output_buffer); -+ xmlBufferAdd(buffer, BAD_CAST "", 1); -+ -+ return buffer; -+} -+ - static char* - get_string_from_xml_node(xmlNode *xmlnode) - { -- xmlOutputBufferPtr buf; -- char *xmlString; -+ xmlBuffer *buffer; -+ char *result; - - if (xmlnode == NULL) { - return NULL; - } -- -- buf = xmlAllocOutputBuffer(NULL); -- if (buf == NULL) { -- xmlString = NULL; -+ buffer = xmlnode_to_xmlbuffer(xmlnode); -+ if (buffer == NULL) { -+ result = NULL; - } else { -- xmlNodeDumpOutput(buf, NULL, xmlnode, 0, 1, NULL); -- xmlOutputBufferFlush(buf); -- if (buf->conv == NULL) { -- xmlString = estrdup((char*)buf->buffer->content); -- } else { -- xmlString = estrdup((char*)buf->conv->content); -- } -- xmlOutputBufferClose(buf); -+ result = estrdup((char*)xmlBufferContent(buffer)); -+ xmlBufferFree(buffer); - } -- -- return xmlString; -+ return result; - } - - static xmlNode* diff --git a/security/lasso/patches/patch-bindings-python-wrapper_top.c b/security/lasso/patches/patch-bindings-python-wrapper_top.c deleted file mode 100644 index 2291d0697c8..00000000000 --- a/security/lasso/patches/patch-bindings-python-wrapper_top.c +++ /dev/null @@ -1,68 +0,0 @@ -$NetBSD: patch-bindings-python-wrapper_top.c,v 1.1 2012/10/23 18:16:15 manu Exp $ - -Patch from upstream to support libxml >= 2.9.0. From commit message: - -Libxml stopped exposing the internal of the xmlOutputBuffer structure; -it was replace by proper use of the API and of the xmlBuffer structure. - -There could be regression for older version of libxml as some functions -appeared in recent version of libxml; but the reference API document -does not give any introduction date for functions so it's hard to be -sure. - -diff --git a/bindings/python/wrapper_top.c b/bindings/python/wrapper_top.c -index 7879bb1..2c68437 100644 ---- bindings/python/wrapper_top.c -+++ bindings/python/wrapper_top.c -@@ -103,28 +103,40 @@ get_dict_from_hashtable_of_strings(GHashTable *value) - return proxy; - } - -+static xmlBuffer* -+xmlnode_to_xmlbuffer(xmlNode *node) -+{ -+ xmlOutputBufferPtr output_buffer; -+ xmlBuffer *buffer; -+ -+ if (! node) -+ return NULL; -+ -+ buffer = xmlBufferCreate(); -+ output_buffer = xmlOutputBufferCreateBuffer(buffer, NULL); -+ xmlNodeDumpOutput(output_buffer, NULL, node, 0, 0, NULL); -+ xmlOutputBufferClose(output_buffer); -+ xmlBufferAdd(buffer, BAD_CAST "", 1); -+ -+ return buffer; -+} -+ - static PyObject* - get_pystring_from_xml_node(xmlNode *xmlnode) - { -- xmlOutputBufferPtr buf; - PyObject *pystring = NULL; -+ xmlBuffer *buffer; - - if (xmlnode == NULL) { - return NULL; - } -+ buffer = xmlnode_to_xmlbuffer(xmlnode); - -- buf = xmlAllocOutputBuffer(NULL); -- if (buf == NULL) { -+ if (buffer == NULL) { - pystring = NULL; - } else { -- xmlNodeDumpOutput(buf, NULL, xmlnode, 0, 1, NULL); -- xmlOutputBufferFlush(buf); -- if (buf->conv == NULL) { -- pystring = PyString_FromString((char*)buf->buffer->content); -- } else { -- pystring = PyString_FromString((char*)buf->conv->content); -- } -- xmlOutputBufferClose(buf); -+ pystring = PyString_FromString((char*)xmlBufferContent(buffer)); -+ xmlBufferFree(buffer); - } - - return pystring; diff --git a/security/lasso/patches/patch-configure b/security/lasso/patches/patch-configure index 037e4d93bc3..4ebb807d07a 100644 --- a/security/lasso/patches/patch-configure +++ b/security/lasso/patches/patch-configure @@ -1,11 +1,24 @@ -$NetBSD: patch-configure,v 1.1 2014/02/05 09:26:58 manu Exp $ +$NetBSD: patch-configure,v 1.2 2015/04/01 14:05:02 manu Exp $ Make sure _POSIX_C_SOURCE=199506 so that strtok() is defined by <string.h> Otherwise, compiler assumes it returns an int, which badly breaks on LP64 ---- configure.orig 2014-02-05 08:57:10.000000000 +0000 -+++ configure 2014-02-05 08:58:04.000000000 +0000 -@@ -14461,8 +14461,9 @@ +Also use = instead of == for test(1) portability sake. + +--- configure.orig 2014-08-28 16:05:55.000000000 +0200 ++++ configure 2015-03-25 11:43:14.000000000 +0100 +@@ -13771,9 +13771,9 @@ + enable_java=no + JAVA_VERSION="" + fi + +-if test "$DARWIN" == 1; then ++if test "$DARWIN" = 1; then + JNI_EXTRA_LDFLAGS="-shrext .jnilib" + fi + + if test "x$enable_java" = "xyes"; then +@@ -15279,8 +15279,9 @@ fi diff --git a/security/lasso/patches/patch-configure.ac b/security/lasso/patches/patch-configure.ac index 75cb336614e..fd1e9e3317a 100644 --- a/security/lasso/patches/patch-configure.ac +++ b/security/lasso/patches/patch-configure.ac @@ -1,11 +1,24 @@ -$NetBSD: patch-configure.ac,v 1.1 2014/02/05 09:26:58 manu Exp $ +$NetBSD: patch-configure.ac,v 1.2 2015/04/01 14:05:02 manu Exp $ Make sure _POSIX_C_SOURCE=199506 so that strtok() is defined by <string.h> Otherwise, compiler assumes it returns an int, which badly breaks on LP64 ---- configure.ac.orig 2014-02-05 08:56:57.000000000 +0000 -+++ configure.ac 2014-02-05 08:56:37.000000000 +0000 -@@ -781,8 +781,10 @@ +Also use = instead of == for test(1) portability sake. + +--- configure.ac.orig 2014-08-28 15:47:50.000000000 +0200 ++++ configure.ac 2015-03-25 11:43:28.000000000 +0100 +@@ -286,9 +286,9 @@ + JAVA_VERSION="" + fi + + dnl Support JNI under MacOsX +-if test "$DARWIN" == 1; then ++if test "$DARWIN" = 1; then + JNI_EXTRA_LDFLAGS="-shrext .jnilib" + fi + + dnl Conditional java sub dir test. +@@ -748,8 +748,10 @@ dnl ========================================================================== dnl Final steps: lasso config dnl ========================================================================== diff --git a/security/lasso/patches/patch-docs-reference-lasso-lasso-sections.txt b/security/lasso/patches/patch-docs-reference-lasso-lasso-sections.txt deleted file mode 100644 index 87fbc7acde5..00000000000 --- a/security/lasso/patches/patch-docs-reference-lasso-lasso-sections.txt +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-docs-reference-lasso-lasso-sections.txt,v 1.1 2012/10/23 18:16:15 manu Exp $ - -Patch from upstream to support libxml >= 2.9.0. From commit message: - -Libxml stopped exposing the internal of the xmlOutputBuffer structure; -it was replace by proper use of the API and of the xmlBuffer structure. - -There could be regression for older version of libxml as some functions -appeared in recent version of libxml; but the reference API document -does not give any introduction date for functions so it's hard to be -sure. - -diff --git a/docs/reference/lasso/lasso-sections.txt b/docs/reference/lasso/lasso-sections.txt -index 74d998a..ee44d06 100644 ---- docs/reference/lasso/lasso-sections.txt -+++ docs/reference/lasso/lasso-sections.txt -@@ -1,4 +1,10 @@ - <SECTION> -+<FILE>utilities</FILE> -+<TITLE>Utilities</TITLE> -+LassoServe_CLASS -+</SECTION> -+ -+<SECTION> - <FILE>server</FILE> - <TITLE>LassoServer</TITLE> - LassoServer -@@ -6060,7 +6066,7 @@ LASSO_PROVIDER_ERROR_MISSING_PUBLIC_KEY - </SECTION> - - <SECTION> --<FILE>init</FILE> -+<FILE>lasso</FILE> - <TITLE>Initialization functions</TITLE> - LASSO_EXPORT - LASSO_EXPORT_VAR diff --git a/security/lasso/patches/patch-lasso-errors_c b/security/lasso/patches/patch-lasso-errors_c deleted file mode 100644 index 4ddd8ba16bb..00000000000 --- a/security/lasso/patches/patch-lasso-errors_c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-lasso-errors_c,v 1.1 2012/05/06 17:14:58 dholland Exp $ - -Fix build with latest glib2. - ---- lasso/errors.c~ 2011-01-05 13:57:32.000000000 +0000 -+++ lasso/errors.c -@@ -22,7 +22,7 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include <glib/gstrfuncs.h> -+#include <glib.h> - #include "errors.h" - #include "xml/xml.h" - diff --git a/security/lasso/patches/patch-lasso-errors_c_in b/security/lasso/patches/patch-lasso-errors_c_in deleted file mode 100644 index 103d4c7941c..00000000000 --- a/security/lasso/patches/patch-lasso-errors_c_in +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-lasso-errors_c_in,v 1.1 2012/05/06 17:14:58 dholland Exp $ - -Fix build with latest glib2. - ---- lasso/errors.c.in~ 2011-01-05 13:57:32.000000000 +0000 -+++ lasso/errors.c.in -@@ -22,7 +22,7 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include <glib/gstrfuncs.h> -+#include <glib.h> - #include "errors.h" - #include "xml/xml.h" - diff --git a/security/lasso/patches/patch-lasso-id-ff-provider.c b/security/lasso/patches/patch-lasso-id-ff-provider.c index 45fdee6b57b..b58cdb5b420 100644 --- a/security/lasso/patches/patch-lasso-id-ff-provider.c +++ b/security/lasso/patches/patch-lasso-id-ff-provider.c @@ -1,12 +1,14 @@ -$NetBSD: patch-lasso-id-ff-provider.c,v 1.1 2011/09/08 00:17:03 joerg Exp $ +$NetBSD: patch-lasso-id-ff-provider.c,v 1.2 2015/04/01 14:05:02 manu Exp $ ---- lasso/id-ff/provider.c.orig 2011-09-07 03:26:19.000000000 +0000 -+++ lasso/id-ff/provider.c -@@ -64,6 +64,7 @@ use this default role to access descript +--- lasso/id-ff/provider.c.orig 2014-07-30 17:16:07.000000000 +0200 ++++ lasso/id-ff/provider.c 2015-03-25 11:29:15.000000000 +0100 +@@ -62,8 +62,9 @@ + #include "providerprivate.h" #include "../saml-2.0/providerprivate.h" #include <unistd.h> +#include <string.h> #include "../utils.h" #include "../debug.h" + #include "../keyprivate.h" diff --git a/security/lasso/patches/patch-lasso-xml-tools.c b/security/lasso/patches/patch-lasso-xml-tools.c deleted file mode 100644 index 83195561208..00000000000 --- a/security/lasso/patches/patch-lasso-xml-tools.c +++ /dev/null @@ -1,195 +0,0 @@ -$NetBSD: patch-lasso-xml-tools.c,v 1.5 2012/12/15 15:29:28 manu Exp $ - -Patch from upstream to support libxml >= 2.9.0. From commit message: - -Libxml stopped exposing the internal of the xmlOutputBuffer structure; -it was replace by proper use of the API and of the xmlBuffer structure. - -There could be regression for older version of libxml as some functions -appeared in recent version of libxml; but the reference API document -does not give any introduction date for functions so it's hard to be -sure. - -Don't use nested functions. - -diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c -index c4b3c8a..cda8775 100644 ---- lasso/xml/tools.c.orig 2011-11-29 09:19:49.000000000 +0000 -+++ lasso/xml/tools.c -@@ -27,6 +27,7 @@ - /* permit importation of timegm for glibc2, wait for people to complain it does not work on their - * system. */ - #define _BSD_SOURCE -+#define _NETBSD_SOURCE - #include "private.h" - #include <string.h> - #include <time.h> -@@ -36,6 +37,7 @@ - #include <libxml/uri.h> - #include <libxml/parser.h> - #include <libxml/parserInternals.h> -+#include <libxml/xmlIO.h> - - #include <openssl/pem.h> - #include <openssl/sha.h> -@@ -1043,38 +1045,30 @@ lasso_sign_node(xmlNode *xmlnode, const - return 0; - } - --gchar* --lasso_node_build_deflated_query(LassoNode *node) -+static gchar* -+lasso_xmlnode_build_deflated_query(xmlNode *xmlnode) - { -- /* actually deflated and b64'ed and url-escaped */ -- xmlNode *xmlnode; -- xmlOutputBufferPtr buf; -- xmlCharEncodingHandlerPtr handler = NULL; -- xmlChar *buffer; -+ xmlOutputBuffer *output_buffer; -+ xmlBuffer *buffer; - xmlChar *ret, *b64_ret; - char *rret; - unsigned long in_len; - int rc = 0; - z_stream stream; - -- xmlnode = lasso_node_get_xmlNode(node, FALSE); -- -- handler = xmlFindCharEncodingHandler("utf-8"); -- buf = xmlAllocOutputBuffer(handler); -- xmlNodeDumpOutput(buf, NULL, xmlnode, 0, 0, "utf-8"); -- xmlOutputBufferFlush(buf); -- buffer = buf->conv ? buf->conv->content : buf->buffer->content; -- -- xmlFreeNode(xmlnode); -- xmlnode = NULL; -- -- in_len = strlen((char*)buffer); -+ buffer = xmlBufferCreate(); -+ output_buffer = xmlOutputBufferCreateBuffer(buffer, NULL); -+ xmlNodeDumpOutput(output_buffer, NULL, xmlnode, 0, 0, NULL); -+ xmlOutputBufferClose(output_buffer); -+ xmlBufferAdd(buffer, BAD_CAST "", 1); -+ -+ in_len = strlen((char*)xmlBufferContent(buffer)); - ret = g_malloc(in_len * 2); - /* deflating should never increase the required size but we are - * more conservative than that. Twice the size should be - * enough. */ - -- stream.next_in = buffer; -+ stream.next_in = (xmlChar*)xmlBufferContent(buffer); - stream.avail_in = in_len; - stream.next_out = ret; - stream.avail_out = in_len * 2; -@@ -1097,6 +1091,7 @@ lasso_node_build_deflated_query(LassoNod - rc = deflateEnd(&stream); - } - } -+ xmlBufferFree(buffer); - if (rc != Z_OK) { - lasso_release(ret); - message(G_LOG_LEVEL_CRITICAL, "Failed to deflate"); -@@ -1104,7 +1099,6 @@ lasso_node_build_deflated_query(LassoNod - } - - b64_ret = xmlSecBase64Encode(ret, stream.total_out, 0); -- xmlOutputBufferClose(buf); - lasso_release(ret); - - ret = xmlURIEscapeStr(b64_ret, NULL); -@@ -1115,6 +1109,20 @@ lasso_node_build_deflated_query(LassoNod - return rret; - } - -+gchar* -+lasso_node_build_deflated_query(LassoNode *node) -+{ -+ /* actually deflated and b64'ed and url-escaped */ -+ xmlNode *xmlnode; -+ gchar *result; -+ -+ xmlnode = lasso_node_get_xmlNode(node, FALSE); -+ result = lasso_xmlnode_build_deflated_query(xmlnode); -+ xmlFreeNode(xmlnode); -+ return result; -+} -+ -+ - gboolean - lasso_node_init_from_deflated_query_part(LassoNode *node, char *deflate_string) - { -@@ -1196,28 +1204,34 @@ lasso_concat_url_query(const char *url, - * - * Return value: TRUE if no error occurred during evaluation, FALSE otherwise. - */ -+static void -+structuredErrorFunc (void *userData, xmlErrorPtr error) { -+ struct wrapped_cb_data *data = userData; -+ *(int *)userData = error->code; -+} -+ - gboolean - lasso_eval_xpath_expression(xmlXPathContextPtr xpath_ctx, const char *expression, - xmlXPathObjectPtr *xpath_object_ptr, int *xpath_error_code) - { -- xmlXPathObject *xpath_object = NULL; -- int errorCode = 0; - xmlStructuredErrorFunc oldStructuredErrorFunc; -+ void *oldUserData; -+ int errorCode = 0; -+ xmlXPathObject *xpath_object = NULL; - gboolean rc = TRUE; - -- void structuredErrorFunc (G_GNUC_UNUSED void *userData, xmlErrorPtr error) { -- errorCode = error->code; -- } -- - g_return_val_if_fail(xpath_ctx != NULL && expression != NULL, FALSE); - - if (xpath_error_code) { /* reset */ - *xpath_error_code = 0; - } - oldStructuredErrorFunc = xpath_ctx->error; -+ oldUserData = xpath_ctx->userData; - xpath_ctx->error = structuredErrorFunc; -+ xpath_ctx->userData = &errorCode; - xpath_object = xmlXPathEvalExpression((xmlChar*)expression, xpath_ctx); - xpath_ctx->error = oldStructuredErrorFunc; -+ xpath_ctx->userData = oldUserData; - - if (xpath_object) { - if (xpath_object_ptr) { -@@ -2144,22 +2158,21 @@ cleanup: - char* - lasso_xmlnode_to_string(xmlNode *node, gboolean format, int level) - { -- xmlOutputBufferPtr buf; -- xmlCharEncodingHandlerPtr handler = NULL; -- xmlChar *buffer; -+ xmlOutputBufferPtr output_buffer; -+ xmlBuffer *buffer; - char *str; - - if (! node) - return NULL; - -- handler = xmlFindCharEncodingHandler("utf-8"); -- buf = xmlAllocOutputBuffer(handler); -- xmlNodeDumpOutput(buf, NULL, node, level, format ? 1 : 0, "utf-8"); -- xmlOutputBufferFlush(buf); -- buffer = buf->conv ? buf->conv->content : buf->buffer->content; -+ buffer = xmlBufferCreate(); -+ output_buffer = xmlOutputBufferCreateBuffer(buffer, NULL); -+ xmlNodeDumpOutput(output_buffer, NULL, node, level, format ? 1 : 0, NULL); -+ xmlOutputBufferClose(output_buffer); -+ xmlBufferAdd(buffer, BAD_CAST "", 1); - /* do not mix XML and GLib strings, so we must copy */ -- str = g_strdup((char*)buffer); -- xmlOutputBufferClose(buf); -+ str = g_strdup((char*)xmlBufferContent(buffer)); -+ xmlBufferFree(buffer); - - return str; - } diff --git a/security/lasso/patches/patch-lasso_id-ff_lecp.c b/security/lasso/patches/patch-lasso_id-ff_lecp.c deleted file mode 100644 index e251d90bf4c..00000000000 --- a/security/lasso/patches/patch-lasso_id-ff_lecp.c +++ /dev/null @@ -1,68 +0,0 @@ -$NetBSD: patch-lasso_id-ff_lecp.c,v 1.2 2012/10/23 18:16:15 manu Exp $ - -Patch from upstream to support libxml >= 2.9.0. From commit message: - -Libxml stopped exposing the internal of the xmlOutputBuffer structure; -it was replace by proper use of the API and of the xmlBuffer structure. - -There could be regression for older version of libxml as some functions -appeared in recent version of libxml; but the reference API document -does not give any introduction date for functions so it's hard to be -sure. - -diff --git a/lasso/id-ff/lecp.c b/lasso/id-ff/lecp.c -index 6ca9515..1dd53b6 100644 ---- lasso/id-ff/lecp.c -+++ lasso/id-ff/lecp.c -@@ -58,8 +58,6 @@ lasso_lecp_build_authn_request_envelope_msg(LassoLecp *lecp) - LassoProfile *profile; - gchar *assertionConsumerServiceURL; - xmlNode *msg; -- xmlOutputBuffer *buf; -- xmlCharEncodingHandler *handler; - - g_return_val_if_fail(LASSO_IS_LECP(lecp), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); - -@@ -89,16 +87,7 @@ lasso_lecp_build_authn_request_envelope_msg(LassoLecp *lecp) - LASSO_PROFILE(lecp)->server->certificate; - msg = lasso_node_get_xmlNode(LASSO_NODE(lecp->authnRequestEnvelope), FALSE); - -- /* msg is not SOAP but straight XML */ -- handler = xmlFindCharEncodingHandler("utf-8"); -- buf = xmlAllocOutputBuffer(handler); -- xmlNodeDumpOutput(buf, NULL, msg, 0, 0, "utf-8"); -- xmlOutputBufferFlush(buf); -- -- lasso_assign_string(profile->msg_body, -- (char*)(buf->conv ? buf->conv->content : buf->buffer->content)); -- xmlOutputBufferClose(buf); -- xmlFreeNode(msg); -+ lasso_assign_new_string(profile->msg_body, lasso_xmlnode_to_string(msg, 0, 0)) - - if (profile->msg_body == NULL) { - return LASSO_PROFILE_ERROR_BUILDING_REQUEST_FAILED; -@@ -299,8 +288,6 @@ lasso_lecp_process_authn_request_envelope_msg(LassoLecp *lecp, const char *reque - xmlXPathContext *xpathCtx; - xmlXPathObject *xpathObj; - xmlNode *soap_envelope, *soap_body, *authn_request; -- xmlOutputBuffer *buf; -- xmlCharEncodingHandler *handler; - - g_return_val_if_fail(LASSO_IS_LECP(lecp), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); - g_return_val_if_fail(request_msg != NULL, LASSO_PARAM_ERROR_INVALID_VALUE); -@@ -337,13 +324,8 @@ lasso_lecp_process_authn_request_envelope_msg(LassoLecp *lecp, const char *reque - soap_body = xmlNewTextChild(soap_envelope, NULL, (xmlChar*)"Body", NULL); - xmlAddChild(soap_body, authn_request); - -- handler = xmlFindCharEncodingHandler("utf-8"); -- buf = xmlAllocOutputBuffer(handler); -- xmlNodeDumpOutput(buf, NULL, soap_envelope, 0, 0, "utf-8"); -- xmlOutputBufferFlush(buf); -- LASSO_PROFILE(lecp)->msg_body = g_strdup( (char*)( -- buf->conv ? buf->conv->content : buf->buffer->content)); -- xmlOutputBufferClose(buf); -+ lasso_assign_new_string(LASSO_PROFILE(lecp)->msg_body, -+ lasso_xmlnode_to_string(soap_envelope, 0, 0)); - xmlFreeNode(soap_envelope); - - diff --git a/security/lasso/patches/patch-lasso_id-ff_session.c b/security/lasso/patches/patch-lasso_id-ff_session.c deleted file mode 100644 index 06022a594ee..00000000000 --- a/security/lasso/patches/patch-lasso_id-ff_session.c +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-lasso_id-ff_session.c,v 1.2 2012/10/23 18:16:15 manu Exp $ - -Patch from upstream to support libxml >= 2.9.0. From commit message: - -Libxml stopped exposing the internal of the xmlOutputBuffer structure; -it was replace by proper use of the API and of the xmlBuffer structure. - -There could be regression for older version of libxml as some functions -appeared in recent version of libxml; but the reference API document -does not give any introduction date for functions so it's hard to be -sure. - -diff --git a/lasso/id-ff/session.c b/lasso/id-ff/session.c -index a64f379..f770348 100644 ---- lasso/id-ff/session.c -+++ lasso/id-ff/session.c -@@ -437,27 +437,12 @@ add_assertion_childnode(gchar *key, LassoLibAssertion *value, DumpContext *conte - - xmlChar * - xmlNode_to_base64(xmlNode *node) { -- xmlOutputBufferPtr buf = NULL; -- xmlCharEncodingHandlerPtr handler = NULL; -- xmlChar *buffer = NULL; -+ gchar *buffer = NULL; - xmlChar *ret = NULL; - -- handler = xmlFindCharEncodingHandler("utf-8"); -- if (! handler) -- goto cleanup; -- buf = xmlAllocOutputBuffer(handler); -- if (! buf) -- goto cleanup; -- xmlNodeDumpOutput(buf, NULL, node, 0, 0, "utf-8"); -- xmlOutputBufferFlush(buf); -- buffer = buf->conv ? buf->conv->content : buf->buffer->content; -- -- ret = xmlSecBase64Encode(buffer, strlen((char*)buffer), 0); -- --cleanup: -- if (buf) -- xmlOutputBufferClose(buf); -- -+ buffer = lasso_xmlnode_to_string(node, 0, 0); -+ ret = xmlSecBase64Encode(BAD_CAST buffer, strlen((char*)buffer), 0); -+ lasso_release_string(buffer); - return ret; - } - diff --git a/security/lasso/patches/patch-lasso_saml-2.0_ecp.c b/security/lasso/patches/patch-lasso_saml-2.0_ecp.c deleted file mode 100644 index 324db384803..00000000000 --- a/security/lasso/patches/patch-lasso_saml-2.0_ecp.c +++ /dev/null @@ -1,70 +0,0 @@ -$NetBSD: patch-lasso_saml-2.0_ecp.c,v 1.2 2012/10/23 18:16:15 manu Exp $ - -Patch from upstream to support libxml >= 2.9.0. From commit message: - -Libxml stopped exposing the internal of the xmlOutputBuffer structure; -it was replace by proper use of the API and of the xmlBuffer structure. - -There could be regression for older version of libxml as some functions -appeared in recent version of libxml; but the reference API document -does not give any introduction date for functions so it's hard to be -sure. - -diff --git a/lasso/saml-2.0/ecp.c b/lasso/saml-2.0/ecp.c -index 655162c..9ef9d97 100644 ---- lasso/saml-2.0/ecp.c -+++ lasso/saml-2.0/ecp.c -@@ -128,8 +128,6 @@ lasso_ecp_process_authn_request_msg(LassoEcp *ecp, const char *authn_request_msg - xmlXPathContext *xpathCtx; - xmlXPathObject *xpathObj; - xmlNode *xmlnode; -- xmlOutputBuffer *buf; -- xmlCharEncodingHandler *handler; - LassoProfile *profile; - LassoProvider *remote_provider; - -@@ -170,13 +168,8 @@ lasso_ecp_process_authn_request_msg(LassoEcp *ecp, const char *authn_request_msg - xpathObj = NULL; - - xmlnode = xmlDocGetRootElement(doc); -- handler = xmlFindCharEncodingHandler("utf-8"); -- buf = xmlAllocOutputBuffer(handler); -- xmlNodeDumpOutput(buf, NULL, xmlnode, 0, 0, "utf-8"); -- xmlOutputBufferFlush(buf); -- LASSO_PROFILE(ecp)->msg_body = g_strdup( -- (char*)(buf->conv ? buf->conv->content : buf->buffer->content)); -- xmlOutputBufferClose(buf); -+ lasso_assign_new_string(LASSO_PROFILE(ecp)->msg_body, -+ lasso_xmlnode_to_string(xmlnode, 0, 0)) - lasso_release_doc(doc); - - profile->remote_providerID = lasso_server_get_first_providerID_by_role(profile->server, LASSO_PROVIDER_ROLE_IDP); -@@ -206,8 +199,6 @@ lasso_ecp_process_response_msg(LassoEcp *ecp, const char *response_msg) - xmlXPathObject *xpathObj; - xmlNode *new_envelope, *header, *paos_response, *ecp_relay_state; - xmlNode *body = NULL; -- xmlOutputBuffer *buf; -- xmlCharEncodingHandler *handler; - xmlNs *soap_env_ns, *ecp_ns; - - g_return_val_if_fail(LASSO_IS_ECP(ecp), LASSO_PARAM_ERROR_BAD_TYPE_OR_NULL_OBJ); -@@ -270,17 +261,9 @@ lasso_ecp_process_response_msg(LassoEcp *ecp, const char *response_msg) - } - - xmlAddChild(new_envelope, body); -- -- handler = xmlFindCharEncodingHandler("utf-8"); -- buf = xmlAllocOutputBuffer(handler); -- xmlNodeDumpOutput(buf, NULL, new_envelope, 0, 0, "utf-8"); -- xmlOutputBufferFlush(buf); -- LASSO_PROFILE(ecp)->msg_body = g_strdup( -- (char*)(buf->conv ? buf->conv->content : buf->buffer->content)); -- xmlOutputBufferClose(buf); -- -+ lasso_assign_new_string(LASSO_PROFILE(ecp)->msg_body, -+ lasso_xmlnode_to_string(new_envelope, 0, 0)) - lasso_release_doc(doc); -- - return 0; - } - |