Description of problem: During 5.0 and 5.1 we released Errata for openssl within solaris bootstrap packages. To do this you grab src.rpm hack and edit the spec file for openssl to build on solaris build roots and then compile the binary to then package up as needed. A lot of by-hand stuff, prone to mistake if you miss something. Lookign back, I see three possible spec files for the openssl-0.9.7a-33.24 that we used. I do not know know which is authoritative. This bug is to track the possible variations that we may need if we ever in future need to recompile/rebase openssl again for our Solaris packages. Workstation - openssl-0.9.7a-33.24.rhn.3.src.rpm Barn - openssl-0.9.7a-33.24.rhn.2.src.rpm CVS - openssl-0.9.7a-33.24.rhn.2.src.rpm $ md5sum openssl-0.9.7a-33.24.rhn.2.src.rpm-cvs 49b7c8d4472bda7d6c434ed777d86f84 openssl-0.9.7a-33.24.rhn.2.src.rpm-cvs $ md5sum openssl-0.9.7a-33.24.rhn.2.src.rpm-barn b381db63fe5dcd2a30e086e812cbed45 openssl-0.9.7a-33.24.rhn.2.src.rpm-barn $ Not sure which was the one we used or why difference, but as an FYI - openssl on barn (http://barn.rhndev.redhat.com/repo/repository/openssl/?C=M;O=D) is different to one I see in CVS solaris/buildroot/rpms/openssl-0.9.7a-33.24.rhn.2.src.rpm md5sum diff, plus diff shows: [cperry@cperry temp]$ diff -uNr openssl/ openssl-barn/ diff -uNr openssl/openssl-0.9.7c-ICA-sparc-hpux-rhn.patch openssl-barn/openssl-0.9.7c-ICA-sparc-hpux-rhn.patch --- openssl/openssl-0.9.7c-ICA-sparc-hpux-rhn.patch 2009-05-15 10:25:04.000000000 -0400 +++ openssl-barn/openssl-0.9.7c-ICA-sparc-hpux-rhn.patch 2009-05-15 10:15:49.000000000 -0400 @@ -13,7 +13,7 @@ #define ICA_ADAPTER_HANDLE int -! #if defined(linux) || defined (_AIX) || defined(__hpux) || defined(__sparc) || defined(__i386) +! #if defined(linux) || defined (_AIX) || defined(__hpux) || defined(__sparc) #define ICA_CALL #endif diff -uNr openssl/openssl.spec openssl-barn/openssl.spec --- openssl/openssl.spec 2009-05-15 10:25:04.000000000 -0400 +++ openssl-barn/openssl.spec 2009-05-15 10:15:49.000000000 -0400 @@ -248,16 +248,11 @@ %endif %ifos solaris2.9 echo "solaris 2.9" -%ifarch sparc - echo "solaris 2.9 sparc" +if %{_arch} == 'sparc' ; then sslarch=solaris-sparcv9-gcc -%endif -%ifarch %ix86 - echo "solaris 2.9 i386" - sslarch=solaris-x86-gcc -%endif -sslflags=no-asm -RPM_OPT_FLAGS="$RPM_OPT_FLAGS -L %{_libdir}" + sslflags=no-asm + RPM_OPT_FLAGS="$RPM_OPT_FLAGS -L %{_libdir}" +fi %endif # %ifarch sparc [cperry@cperry temp]$ Now, my local workstation '.3' package, which does not seem to have been used has the following diff: [cperry@cperry temp]$ diff -uNr openssl-barn openssl-3 diff -uNr openssl-barn/openssl.spec openssl-3/openssl.spec --- openssl-barn/openssl.spec 2009-05-15 10:15:49.000000000 -0400 +++ openssl-3/openssl.spec 2009-05-15 10:52:11.000000000 -0400 @@ -39,7 +39,7 @@ Summary: The OpenSSL toolkit. Name: openssl Version: 0.9.7a -Release: 33.24.rhn.2%{?_tag} +Release: 33.24.rhn.3%{?_tag} Source: openssl-%{version}-usa.tar.bz2 Source1: hobble-openssl Source2: Makefile.certificate @@ -240,7 +240,7 @@ # %ifos solaris2.8 echo "solaris 2.8" -if %{_arch} == 'sparc' ; then +if %{_arch} == 'sparc' ; then sslarch=solaris-sparcv8-gcc sslflags=no-asm RPM_OPT_FLAGS="$RPM_OPT_FLAGS -L %{_libdir}" @@ -248,11 +248,16 @@ %endif %ifos solaris2.9 echo "solaris 2.9" -if %{_arch} == 'sparc' ; then +if %{_arch} == 'sparc' ; then sslarch=solaris-sparcv9-gcc sslflags=no-asm RPM_OPT_FLAGS="$RPM_OPT_FLAGS -L %{_libdir}" fi +if %{_arch} == 'i386' ; then + sslarch=solaris-x86-gcc + sslflags=no-asm + RPM_OPT_FLAGS="$RPM_OPT_FLAGS -L %{_libdir}" +fi %endif # %ifarch sparc [cperry@cperry temp]$ So - again, I need to make sure this is captured for historical reasons in case we need to re-live the pain again :) Cliff Version-Release number of selected component (if applicable): How reproducible: Steps to Reproduce: 1. 2. 3. Actual results: Expected results: Additional info:
The one in cvs was correct version. One on barn did not compile. Jan uploaded correct version to barn. Going to close this out. Cliff.