Revision: 27120 http://sourceforge.net/p/gar/code/27120 Author: jake_goerzen Date: 2024-11-21 23:45:47 +0000 (Thu, 21 Nov 2024) Log Message: ----------- openssl1/branches/lts111: clean up CHECKPKG_OVERRIDES and recipe finalizations for pkg release
Modified Paths: -------------- csw/mgar/pkg/openssl1/branches/lts111/Makefile Modified: csw/mgar/pkg/openssl1/branches/lts111/Makefile =================================================================== --- csw/mgar/pkg/openssl1/branches/lts111/Makefile 2024-11-21 11:47:13 UTC (rev 27119) +++ csw/mgar/pkg/openssl1/branches/lts111/Makefile 2024-11-21 23:45:47 UTC (rev 27120) @@ -48,7 +48,7 @@ RUNTIME_DEP_PKGS_CSWlibssl1-1 = $(RUNTIME_DEP_PKGS_CSWlibssl1-1_$(GARCOMPILER_TYPE)) RUNTIME_DEP_PKGS_CSWlibssl1-1_GNU = CSWlibgcc-s1 -SPKG_DESC_CSWlibssl1-1 = Openssl 1.0 runtime libraries +SPKG_DESC_CSWlibssl1-1 = Openssl 1.1 runtime libraries PKGFILES_CSWlibssl1-1 = $(PKGFILES_RT) PKGFILES_CSWlibssl1-1 += $(libdir)(/[^/]*)?/openssl-1.1/engines/.* PKGFILES_CSWlibssl1-1 += $(prefix)/etc/ssl/private $(prefix)/etc/ssl/certs @@ -55,13 +55,13 @@ PKGFILES_CSWlibssl1-1 += $(docdir)/libssl1_1/.* RUNTIME_DEP_PKGS_CSWlibssl-dev = CSWlibssl1-1 -SPKG_DESC_CSWlibssl-dev = Openssl 1.0 development support files +SPKG_DESC_CSWlibssl-dev = Openssl 1.1 development support files PKGFILES_CSWlibssl-dev = $(PKGFILES_DEVEL) PKGFILES_CSWlibssl-dev += $(docdir)/libssl_dev/.* RUNTIME_DEP_PKGS_CSWopenssl-utils = CSWlibssl1-1 RUNTIME_DEP_PKGS_CSWopenssl-utils += CSWperl -SPKG_DESC_CSWopenssl-utils = Openssl 1.0 binaries and related tools +SPKG_DESC_CSWopenssl-utils = Openssl 1.1 binaries and related tools PKGFILES_CSWopenssl-utils = $(bindir)/[^/]* $(bindir)/.*/openssl PKGFILES_CSWopenssl-utils += $(mandir)/man1/.* $(mandir)/man5/.* $(mandir)/man7/.* PKGFILES_CSWopenssl-utils += $(prefix)/ssl/misc/.* @@ -77,19 +77,21 @@ CHECKPKG_OVERRIDES_CSWlibssl1-1 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libcrypto.so.1.1|soname=libcrypto.so.1.1|pkgname=CSWlibssl1-1|expected=CSWlibcrypto1-1 CHECKPKG_OVERRIDES_CSWlibssl1-1 += $(CHECKPKG_OVERRIDES_CSWlibssl1-1_$(GARCH)) -CHECKPKG_OVERRIDES_CSWlibssl1-1_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv8plus/libcrypto.so.1.1|soname=libcrypto.so.1.1|pkgname=CSWlibssl1-1|expected=CSWlibcrypto1-1 -CHECKPKG_OVERRIDES_CSWlibssl1-1_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv8plus+vis/libcrypto.so.1.1|soname=libcrypto.so.1.1|pkgname=CSWlibssl1-1|expected=CSWlibcrypto1-1 CHECKPKG_OVERRIDES_CSWlibssl1-1_sparc += shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libcrypto.so.1.1|soname=libcrypto.so.1.1|pkgname=CSWlibssl1-1|expected=CSWlibcrypto1-1 CHECKPKG_OVERRIDES_CSWlibssl1-1_i386 += shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libcrypto.so.1.1|soname=libcrypto.so.1.1|pkgname=CSWlibssl1-1|expected=CSWlibcrypto1-1 -# Solaris 11 requires forbidden interface version SUNWWpublic +###### Specific Overrrids because we we build sparcv8+ on Solaris 9 ##### +CHECKPKG_OVERRIDES_CSWlibssl1-1_sparc_5.9 += binary-architecture-does-not-match-placement|file=opt/csw/lib/libcrypto.so.1.1|arch_id=18|arch_name=sparcv8+ +CHECKPKG_OVERRIDES_CSWlibssl1-1_sparc_5.9 += binary-architecture-does-not-match-placement|file=opt/csw/lib/libssl.so.1.1|arch_id=18|arch_name=sparcv8+ -CHECKPKG_OVERRIDES_CSWlibssl1-1 += forbidden-version-interface-dependencies|/opt/csw/lib/sparcv9/libcrypto.so.1.1|requires|forbidden|interface|version|SUNWpublic|in|library|libc.so.1 -CHECKPKG_OVERRIDES_CSWlibssl1-1 += forbidden-version-interface-dependencies|/opt/csw/lib/libcrypto.so.1.1|requires|forbidden|interface|version|SUNWpublic|in|library|libc.so.1 +###### Solaris 11 requires forbidden interface version SUNWpublic ##### +CHECKPKG_OVERRIDES_CSWlibssl1-1_sparc_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/sparcv9/libcrypto.so.1.1|requires|forbidden|interface|version|SUNWpublic|in|library|libc.so.1 +CHECKPKG_OVERRIDES_CSWlibssl1-1_sparc_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/libcrypto.so.1.1|requires|forbidden|interface|version|SUNWpublic|in|library|libc.so.1 +CHECKPKG_OVERRIDES_CSWlibssl1-1_i386_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/amd64/libcrypto.so.1.1|requires|forbidden|interface|version|SUNWpublic|in|library|libc.so.1 +CHECKPKG_OVERRIDES_CSWlibssl1-1_i386_5.11 += forbidden-version-interface-dependencies|/opt/csw/lib/libcrypto.so.1.1|requires|forbidden|interface|version|SUNWpublic|in|library|libc.so.1 -CHECKPKG_OVERRIDES_CSWlibssl1-1 += forbidden-version-interface-dependencies|/opt/csw/lib/amd64/libcrypto.so.1.1|requires|forbidden|interface|version|SUNWpublic|in|library|libc.so.1 -CHECKPKG_OVERRIDES_CSWlibssl1-1 += forbidden-version-interface-dependencies|/opt/csw/lib/libcrypto.so.1.1|requires|forbidden|interface|version|SUNWpublic|in|library|libc.so.1 +CHECKPKG_OVERRIDES_CSWlibssl1-1 += $(CHECKPKG_OVERRIDES_CSWlibssl1-1_$(GARCH)_$(GAROSREL)) ###### Upstream and opencsw files information ####### This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.