From c0709e90cfc7f88f0ef9c11e527c1d5f4be67c5e Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Thu, 4 Oct 2018 10:22:42 -0400 Subject: [PATCH] libassuan: update to 2.5.1 --- components/library/libassuan/Makefile | 15 ++++++---- components/library/libassuan/libassuan.p5m | 9 ++---- .../libassuan/manifests/sample-manifest.p5m | 32 ++++++++++------------ 3 files changed, 26 insertions(+), 30 deletions(-) diff --git a/components/library/libassuan/Makefile b/components/library/libassuan/Makefile index e1300c888..d30d8c968 100644 --- a/components/library/libassuan/Makefile +++ b/components/library/libassuan/Makefile @@ -24,19 +24,22 @@ include ../../../make-rules/shared-macros.mk COMPONENT_NAME= libassuan -COMPONENT_VERSION= 2.1.3 +COMPONENT_VERSION= 2.5.1 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_PROJECT_URL= http://www.gnupg.org/related_software/libassuan/ COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2 COMPONENT_ARCHIVE_HASH= \ - sha256:fa2170b353c928eb59610e0700c34947f1890634ddf7bcf2366c9c88b4f51d1a + sha256:47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449 COMPONENT_ARCHIVE_URL= ftp://ftp.gnupg.org/gcrypt/libassuan/$(COMPONENT_ARCHIVE) +COMPONENT_SIG_URL= ftp://ftp.gnupg.org/gcrypt/libassuan/$(COMPONENT_ARCHIVE).sig COMPONENT_BUGDB= utility/gnupg include $(WS_MAKE_RULES)/prep.mk include $(WS_MAKE_RULES)/configure.mk include $(WS_MAKE_RULES)/ips.mk +CONFIGURE_BINDIR.64 = $(CONFIGURE_BINDIR.32) + CFLAGS+=-D_XPG6 CONFIGURE_ENV += INSTALL="$(INSTALL)" @@ -48,12 +51,12 @@ CONFIGURE_OPTIONS += --disable-static CONFIGURE_OPTIONS += --with-gpg-error-prefix=$(CONFIGURE_PREFIX) CONFIGURE_OPTIONS += --with-pic -build: $(BUILD_32_and_64) +build: $(BUILD_64) -install: $(INSTALL_32_and_64) +install: $(INSTALL_64) -test: $(TEST_32_and_64) +test: $(TEST_64) -REQUIRED_PACKAGES += SUNWcs +REQUIRED_PACKAGES += core-os REQUIRED_PACKAGES += library/security/libgpg-error REQUIRED_PACKAGES += system/library diff --git a/components/library/libassuan/libassuan.p5m b/components/library/libassuan/libassuan.p5m index a2016ad9c..b12650e6f 100644 --- a/components/library/libassuan/libassuan.p5m +++ b/components/library/libassuan/libassuan.p5m @@ -37,15 +37,12 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION) # file path=usr/bin/libassuan-config file path=usr/include/assuan.h -file path=usr/lib/libassuan.so.0.4.3 -file path=usr/lib/$(MACH64)/libassuan.so.0.4.3 +file path=usr/lib/$(MACH64)/libassuan.so.0.8.1 file path=usr/share/aclocal/libassuan.m4 file path=usr/share/info/assuan.info # -link path=usr/lib/libassuan.so.0 target=libassuan.so.0.4.3 -link path=usr/lib/libassuan.so target=libassuan.so.0.4.3 -link path=usr/lib/$(MACH64)/libassuan.so.0 target=libassuan.so.0.4.3 -link path=usr/lib/$(MACH64)/libassuan.so target=libassuan.so.0.4.3 +link path=usr/lib/$(MACH64)/libassuan.so.0 target=libassuan.so.0.8.1 +link path=usr/lib/$(MACH64)/libassuan.so target=libassuan.so.0.8.1 # license libassuan.license license="GPLv3, LGPLv2" #depend type=optional fmri=crypto/gnupg@2.0.21-0.151 diff --git a/components/library/libassuan/manifests/sample-manifest.p5m b/components/library/libassuan/manifests/sample-manifest.p5m index 6a9644fdb..a3404be25 100644 --- a/components/library/libassuan/manifests/sample-manifest.p5m +++ b/components/library/libassuan/manifests/sample-manifest.p5m @@ -1,16 +1,17 @@ # -# This file and its contents are supplied under the terms of the -# Common Development and Distribution License ("CDDL"), version 1.0. -# You may only use this file in accordance with the terms of version -# 1.0 of the CDDL. +# Copyright 2018 # -# A full copy of the text of the CDDL should have accompanied this -# source. A copy of the CDDL is also available via the Internet at -# http://www.illumos.org/license/CDDL. +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. # - -# -# Copyright 2016 +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) @@ -22,15 +23,10 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION) license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)' -file path=usr/bin/$(MACH64)/libassuan-config file path=usr/bin/libassuan-config file path=usr/include/assuan.h -link path=usr/lib/$(MACH64)/libassuan.so target=libassuan.so.0.4.3 -link path=usr/lib/$(MACH64)/libassuan.so.0 target=libassuan.so.0.4.3 -file path=usr/lib/$(MACH64)/libassuan.so.0.4.3 -link path=usr/lib/libassuan.so target=libassuan.so.0.4.3 -link path=usr/lib/libassuan.so.0 target=libassuan.so.0.4.3 -file path=usr/lib/libassuan.so.0.4.3 +link path=usr/lib/$(MACH64)/libassuan.so target=libassuan.so.0.8.1 +link path=usr/lib/$(MACH64)/libassuan.so.0 target=libassuan.so.0.8.1 +file path=usr/lib/$(MACH64)/libassuan.so.0.8.1 file path=usr/share/aclocal/libassuan.m4 file path=usr/share/info/assuan.info -file path=usr/share/info/dir -- 2.11.4.GIT