Hi,

please apply the following patch to the util/cygwin.sh script to
the 0.9.8 branch, the 1.0.1 branch, and trunk.

The patch fixes the generated name for the runtime openssl package
on Cygwin.  So far it used the version number of OpenSSL for the
package name, but with 1.0.1 this is wrong.  Rather, the package name
should reflect the shared library version, not the package version.


Thanks,
Corinna


Index: util/cygwin.sh
===================================================================
RCS file: /home/cvs/cvsroot/src/openssl/util/cygwin.sh,v
retrieving revision 1.10
diff -u -p -r1.10 cygwin.sh
--- util/cygwin.sh      24 Aug 2010 21:51:08 -0000      1.10
+++ util/cygwin.sh      15 Mar 2012 08:20:47 -0000
@@ -11,6 +11,7 @@ CONFIG_OPTIONS="--prefix=/usr shared zli
 INSTALL_PREFIX=/tmp/install/INSTALL
 
 VERSION=
+SHLIB_VERSION_NUMBER=
 SUBVERSION=$1
 
 function cleanup()
@@ -28,6 +29,13 @@ function get_openssl_version()
     echo "       Check value of variable VERSION in Makefile."
     exit 1
   fi
+  eval `grep '^SHLIB_VERSION_NUMBER=' Makefile`
+  if [ -z "${SHLIB_VERSION_NUMBER}" ]
+  then
+    echo "Error: Couldn't retrieve OpenSSL shared lib version from Makefile."
+    echo "       Check value of variable SHLIB_VERSION_NUMBER in Makefile."
+    exit 1
+  fi
 }
 
 function base_install()
@@ -124,7 +132,7 @@ strip usr/bin/*.exe usr/bin/*.dll usr/li
 chmod u-w usr/lib/engines/*.so
 
 # Runtime package
-tar cjf libopenssl${VERSION//[!0-9]/}-${VERSION}-${SUBVERSION}.tar.bz2 \
+tar cjf 
libopenssl${SHLIB_VERSION_NUMBER//[!0-9]/}-${VERSION}-${SUBVERSION}.tar.bz2 \
      usr/bin/cyg*dll
 # Base package
 find etc usr/bin/openssl.exe usr/bin/c_rehash usr/lib/engines usr/share/doc \
@@ -139,7 +147,7 @@ tar cjfT openssl-devel-${VERSION}-${SUBV
 
 ls -l openssl-${VERSION}-${SUBVERSION}.tar.bz2
 ls -l openssl-devel-${VERSION}-${SUBVERSION}.tar.bz2
-ls -l libopenssl${VERSION//[!0-9]/}-${VERSION}-${SUBVERSION}.tar.bz2
+ls -l 
libopenssl${SHLIB_VERSION_NUMBER//[!0-9]/}-${VERSION}-${SUBVERSION}.tar.bz2
 
 cleanup
 

-- 
Corinna Vinschen
Cygwin Project Co-Leader
Red Hat

______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
Development Mailing List                       [email protected]
Automated List Manager                           [email protected]

Reply via email to