Revision: 27115
http://sourceforge.net/p/gar/code/27115
Author: jake_goerzen
Date: 2024-11-15 20:59:33 +0000 (Fri, 15 Nov 2024)
Log Message:
-----------
openssl1/branches/lts111: initial commit: openssl 1.1.1w
Modified Paths:
--------------
csw/mgar/pkg/openssl1/branches/lts111/Makefile
csw/mgar/pkg/openssl1/branches/lts111/checksums
Added Paths:
-----------
csw/mgar/pkg/openssl1/branches/lts111/
Modified: csw/mgar/pkg/openssl1/branches/lts111/Makefile
===================================================================
--- csw/mgar/pkg/openssl1/branches/lts102/Makefile 2024-11-10 14:44:54 UTC
(rev 27114)
+++ csw/mgar/pkg/openssl1/branches/lts111/Makefile 2024-11-15 20:59:33 UTC
(rev 27115)
@@ -2,6 +2,7 @@
# OpenCSW build recipe for OpenSSL
#
# Copyright 2009 Yann Rouillard <y...@pleiades.fr.eu.org>
+# Copyright 2024 Jake Goezen <jgoer...@opencsw.org>
# All rights reserved. Use is subject to license terms.
#
# Redistribution and/or use, with or without modification, is
@@ -13,10 +14,10 @@
###### Package information #######
NAME = openssl
-VERSION = 1.0.2u
+VERSION = 1.1.1w
GARTYPE = v2
# Since version 1.0.0, soname is fixed and does not follow the minor releases
-SONAME=1.0.0
+SONAME=1.1
DESCRIPTION = The Open Source toolkit for SSL and TLS
define BLURB
@@ -34,28 +35,32 @@
GARCOMPILER += $(GARCOMPILER_$(GAROSREL))
GARCOMPILER_TYPE = $(if $(findstring GCC,$(GARCOMPILER)),GNU,SUN)
+# Setting compiler to GNU for all platforms starting with version 1.1.1w
+GARCOMPILER = GNU
+
PKGFORMAT-5.11 = svr4
-PACKAGES = CSWlibssl1-0-0 CSWlibssl-dev CSWopenssl-utils
+PACKAGES = CSWlibssl1-1 CSWlibssl-dev CSWopenssl-utils
PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
PACKAGING_PLATFORMS += solaris11-sparc solaris11-i386
-RUNTIME_DEP_PKGS_CSWlibssl1-0-0 =
$(RUNTIME_DEP_PKGS_CSWlibssl1-0-0_$(GARCOMPILER_TYPE))
-RUNTIME_DEP_PKGS_CSWlibssl1-0-0_GNU = CSWlibgcc-s1
-SPKG_DESC_CSWlibssl1-0-0 = Openssl 1.0 runtime libraries
-PKGFILES_CSWlibssl1-0-0 = $(PKGFILES_RT)
-PKGFILES_CSWlibssl1-0-0 += $(libdir)(/[^/]*)?/openssl-1.0.0/engines/.*
-PKGFILES_CSWlibssl1-0-0 += $(prefix)/etc/ssl/private $(prefix)/etc/ssl/certs
-PKGFILES_CSWlibssl1-0-0 += $(docdir)/libssl1_0_0/.*
+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
+PKGFILES_CSWlibssl1-1 = $(PKGFILES_RT)
+PKGFILES_CSWlibssl1-1 += $(libdir)(/[^/]*)?/openssl-1.1/engines/.*
+PKGFILES_CSWlibssl1-1 += $(prefix)/etc/ssl/private $(prefix)/etc/ssl/certs
+PKGFILES_CSWlibssl1-1 += $(docdir)/libssl1_1/.*
-RUNTIME_DEP_PKGS_CSWlibssl-dev = CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWlibssl-dev = CSWlibssl1-1
SPKG_DESC_CSWlibssl-dev = Openssl 1.0 development support files
PKGFILES_CSWlibssl-dev = $(PKGFILES_DEVEL)
PKGFILES_CSWlibssl-dev += $(docdir)/libssl_dev/.*
-RUNTIME_DEP_PKGS_CSWopenssl-utils = CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWopenssl-utils = CSWlibssl1-1
+RUNTIME_DEP_PKGS_CSWopenssl-utils += CSWperl
SPKG_DESC_CSWopenssl-utils = Openssl 1.0 binaries and related tools
PKGFILES_CSWopenssl-utils = $(bindir)/[^/]* $(bindir)/.*/openssl
PKGFILES_CSWopenssl-utils += $(mandir)/man1/.* $(mandir)/man5/.*
$(mandir)/man7/.*
@@ -67,33 +72,30 @@
PRESERVECONF = $(sysconfdir)/ssl/openssl.cnf
# We do ship libcrypto in libssl package
-CHECKPKG_OVERRIDES_CSWlibssl1-0-0 +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/libcrypto.so.1.0.0|soname=libcrypto.so.1.0.0|pkgname=CSWlibssl1-0-0|expected=CSWlibcrypto1-0-0
-CHECKPKG_OVERRIDES_CSWlibssl1-0-0 +=
$(CHECKPKG_OVERRIDES_CSWlibssl1-0-0_$(GARCH))
+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-0-0_sparc +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv8plus/libcrypto.so.1.0.0|soname=libcrypto.so.1.0.0|pkgname=CSWlibssl1-0-0|expected=CSWlibcrypto1-0-0
-CHECKPKG_OVERRIDES_CSWlibssl1-0-0_sparc +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv8plus+vis/libcrypto.so.1.0.0|soname=libcrypto.so.1.0.0|pkgname=CSWlibssl1-0-0|expected=CSWlibcrypto1-0-0
-CHECKPKG_OVERRIDES_CSWlibssl1-0-0_sparc +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/sparcv9/libcrypto.so.1.0.0|soname=libcrypto.so.1.0.0|pkgname=CSWlibssl1-0-0|expected=CSWlibcrypto1-0-0
+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-0-0_i386 +=
shared-lib-pkgname-mismatch|file=opt/csw/lib/amd64/libcrypto.so.1.0.0|soname=libcrypto.so.1.0.0|pkgname=CSWlibssl1-0-0|expected=CSWlibcrypto1-0-0
+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
-# We use SUN perl, not the opencsw one
-CHECKPKG_OVERRIDES_CSWopenssl-utils += missing-dependency|CSWperl
-
###### Specific Overrrids because we we build sparcv8+ on Solaris 9 #####
-CHECKPKG_OVERRIDES_CSWlibssl1-0-0 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/libcrypto.so.1.0.0|arch_id=18|arch_name=sparcv8+
-CHECKPKG_OVERRIDES_CSWlibssl1-0-0 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/libssl.so.1.0.0|arch_id=18|arch_name=sparcv8+
-CHECKPKG_OVERRIDES_CSWlibssl1-0-0 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.0.0/engines/libgmp.so|arch_id=18|arch_name=sparcv8+
-CHECKPKG_OVERRIDES_CSWlibssl1-0-0 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.0.0/engines/libnuron.so|arch_id=18|arch_name=sparcv8+
-CHECKPKG_OVERRIDES_CSWlibssl1-0-0 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.0.0/engines/libchil.so|arch_id=18|arch_name=sparcv8+
-CHECKPKG_OVERRIDES_CSWlibssl1-0-0 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.0.0/engines/libpadlock.so|arch_id=18|arch_name=sparcv8+
-CHECKPKG_OVERRIDES_CSWlibssl1-0-0 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.0.0/engines/libcswift.so|arch_id=18|arch_name=sparcv8+
-CHECKPKG_OVERRIDES_CSWlibssl1-0-0 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.0.0/engines/libaep.so|arch_id=18|arch_name=sparcv8+
-CHECKPKG_OVERRIDES_CSWlibssl1-0-0 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.0.0/engines/libubsec.so|arch_id=18|arch_name=sparcv8+
-CHECKPKG_OVERRIDES_CSWlibssl1-0-0 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.0.0/engines/lib4758cca.so|arch_id=18|arch_name=sparcv8+
-CHECKPKG_OVERRIDES_CSWlibssl1-0-0 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.0.0/engines/libcapi.so|arch_id=18|arch_name=sparcv8+
-CHECKPKG_OVERRIDES_CSWlibssl1-0-0 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.0.0/engines/libsureware.so|arch_id=18|arch_name=sparcv8+
-CHECKPKG_OVERRIDES_CSWlibssl1-0-0 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.0.0/engines/libatalla.so|arch_id=18|arch_name=sparcv8+
-CHECKPKG_OVERRIDES_CSWlibssl1-0-0 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.0.0/engines/libgost.so|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWlibssl1-1 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/libcrypto.so.1.1|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWlibssl1-1 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/libssl.so.1.1|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWlibssl1-1 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.1/engines/libgmp.so|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWlibssl1-1 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.1/engines/libnuron.so|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWlibssl1-1 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.1/engines/libchil.so|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWlibssl1-1 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.1/engines/libpadlock.so|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWlibssl1-1 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.1/engines/libcswift.so|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWlibssl1-1 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.1/engines/libaep.so|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWlibssl1-1 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.1/engines/libubsec.so|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWlibssl1-1 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.1/engines/lib4758cca.so|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWlibssl1-1 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.1/engines/libcapi.so|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWlibssl1-1 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.1/engines/libsureware.so|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWlibssl1-1 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.1/engines/libatalla.so|arch_id=18|arch_name=sparcv8+
+CHECKPKG_OVERRIDES_CSWlibssl1-1 +=
binary-architecture-does-not-match-placement|file=opt/csw/lib/openssl-1.1/engines/libgost.so|arch_id=18|arch_name=sparcv8+
###### Upstream and opencsw files information #######
@@ -103,79 +105,11 @@
DISTFILES += README.CSW
DISTFILES += map.openssl.libcrypto map.openssl.libssl map.openssl.engines
-DOCFILES = CHANGES CHANGES.SSLeay PROBLEMS README FAQ README.ASN1 INSTALL NEWS
README.ENGINE
+DOCFILES = CHANGES README FAQ INSTALL NEWS README.ENGINE
# List of engines that will be shipped in the packages
ENGINES = 4758cca aep atalla cswift gmp chil nuron sureware ubsec padlock capi
-
-#some more targets we used in 0.9.8
-PATCHFILES += 0001-more-configure-targets-1_0_2.patch
-
-# This patch is taken from
https://hg.openindiana.org/upstream/oracle/userland-gate/
-# original file:
components/openssl/openssl-1.0.1/patches/18-compiler_opts.patch
-# I think they are smarter than me to figure what are the best compiler options
-PATCHFILES += optimized_configure_targets.patch
-
-
-# We install engines libraries in /opt/csw/lib/engines/1.0.0/
-# instead of /opt/csw/lib/engines to avoid clashes with 0.9.8
-# and futur new release of ssl libraries
-PATCHFILES += 0016-Make-engines-dir-soname-dependant.patch
-
-# Upstream uses an obsolete GCC flag
-# not the case anymore
-
-# Update openssl.cnf path in man page to follow opencsw standard
-PATCHFILES += opencsw_paths.patch
-
-# Make sure man pages and html docs are installed in proper locations
-# instead of /opt/csw/ssl/man and /opt/csw/ssl/html
-PATCHFILES += 0010-Move-manpages-and-html-doc-in-standard-locations.patch
-
-# Let's always block some compromised CA, whatever the CA configured
-# (patchs taken from Debian Package)
-#PATCHFILES += block_bad_certificates.patch
-
-# Add old-style certificates hash generation to maintain compatibilies
-# with gnutls and programs linked with openssl 0.9.8
-# Patch taken from Debian
-PATCHFILES += c_rehash-compat.patch
-
-# Oh yes, let's do symbol versioning so we don't become
-# crazy during library migration
-# Disabled as to many new functions. (Like whole aesni stuff missing, if build
with mapfiles)
-PATCHFILES += 0007-enables-symbols-versioning.patch
-
-# openssl currently only uses issetugid on freebsd and openbsd
-# althought it is also available on Solaris 10
-# We make issetugid support configurable via preprocessor flag
-# to be able to enable it for Solaris
-# Bug opened upstream: http://rt.openssl.org/Ticket/Display.html?id=3153
-PATCHFILES += make_issetugid_support_configurable.patch
-
-ifneq ($(shell /usr/bin/uname -r),5.9)
- PATCHFILES += openssl-1.0.2h-pkcs11-engine.patch
- ENGINES += pk11
- CONFIGURE_ARGS += --pk11-libname=$(abspath
/usr/lib/$(MM_LIBDIR)/libpkcs11.so)
-endif
-
-
-
-# Patches taken form oracle
-PATCHFILES += 029-fork_safe.patch
-PATCHFILES += 032-aes_cbc_len_check.patch
-PATCHFILES += 036-evp_leak.patch
-PATCHFILES += 039-internal_tests.patch
-PATCHFILES += 040-uninitialized_ctx.patch
-PATCHFILES += 043-x86_wrong_platform.patch
-PATCHFILES += 044-suppress_v8plus_abi_warnings.patch
-PATCHFILES += 049-use-srln.patch
-#PATCHFILES += 046-weak-ciphers.patch
-
-PATCHFILES += 050-segfault_configfile.patch
-PATCHFILES += 051-segfault_export.patch
-
LICENSE = LICENSE
##### Build and installation information #####
@@ -251,13 +185,13 @@
CONFIGURE_ARGS += --prefix=$(prefix)
CONFIGURE_ARGS += --openssldir=$(sysconfdir)/ssl
-CONFIGURE_ARGS += --install_prefix=$(DESTDIR) $(LIBDIR)
+#CONFIGURE_ARGS += --install_prefix=$(DESTDIR) $(LIBDIR)
CONFIGURE_ARGS += $(CONFIGURE_FLAGS)
CONFIGURE_ARGS += $($(ISA)_$(GARCOMPILER_TYPE)_CONFIGURE_TARGET)
CONFIGURE_ARGS += shared
-# For now we want the sun perl to be used
-EXTRA_CONFIGURE_ENV += PERL="/usr/bin/perl"
+# We need to use the opencsw perl instead of the sun perl starting with
version 1.1.1w
+EXTRA_CONFIGURE_ENV += PERL="/opt/csw/bin/perl"
# Configure uses make and sun make is not happy
# with the shell command added by the t4 patch
@@ -266,7 +200,7 @@
# The new compiler options taken from
https://hg.openindiana.org/upstream/oracle/userland-gate/
# added "-z defs" to the linker options. That causes object compilation to
fail because
# they are not linked against libc and libdl (for Sol9). This is workaround
until I find a better fix.
-EXTRA_LD_OPTIONS = -lc -ldl
+EXTRA_LD_OPTIONS = -lc -ldl -lrt
# By default, the install target put man pages under
# /opt/csw/ssl/man, but we want them under /opt/csw/share/man
@@ -304,7 +238,7 @@
for ENGINE in $(ENGINES); do \
ln -nf $(WORKDIR)/map.openssl.engines
$(WORKSRC)/engines/map.openssl.lib$$ENGINE; \
done
- ln -nf $(WORKDIR)/map.openssl.engines
$(WORKSRC)/engines/ccgost/map.openssl.libgost
+# ln -nf $(WORKDIR)/map.openssl.engines
$(WORKSRC)/engines/ccgost/map.openssl.libgost
@$(MAKECOOKIE)
install-conf-misc:
Modified: csw/mgar/pkg/openssl1/branches/lts111/checksums
===================================================================
--- csw/mgar/pkg/openssl1/branches/lts102/checksums 2024-11-10 14:44:54 UTC
(rev 27114)
+++ csw/mgar/pkg/openssl1/branches/lts111/checksums 2024-11-15 20:59:33 UTC
(rev 27115)
@@ -1 +1 @@
-cdc2638f789ecc2db2c91488265686c1 openssl-1.0.2u.tar.gz
+3f76825f195e52d4b10c70040681a275 openssl-1.1.1w.tar.gz
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
