openssl: update to 0.9.8j and fix SONAME for the shared lib.

--HG--
extra : convert_revision : 3b42c54b17d871ddf6dd982d5f7c01283af28061
This commit is contained in:
Juan RP 2009-02-04 03:40:25 +01:00
parent b1c26d1dba
commit 09fc2634ad
2 changed files with 36 additions and 10 deletions

View File

@ -0,0 +1,23 @@
--- Makefile.shared.orig 2008-09-17 17:56:40.000000000 +0200
+++ Makefile.shared 2009-02-04 03:01:45.000000000 +0100
@@ -105,7 +105,7 @@ LINK_SO= \
LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
$${SHAREDCMD} $${SHAREDFLAGS} \
- -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
+ -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \
) && $(SYMLINK_SO)
@@ -149,9 +149,9 @@ DO_GNU_SO=$(CALC_VERSIONS); \
SHLIB_SUFFIX=; \
ALLSYMSFLAGS='-Wl,--whole-archive'; \
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
+ SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB.7"
-DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
+DO_GNU_APP=LDFLAGS="$(CFLAGS)"
#This is rather special. It's a special target with which one can link
#applications without bothering with any features that have anything to

View File

@ -1,16 +1,17 @@
# Template file for 'openssl' # Template file for 'openssl'
pkgname=openssl pkgname=openssl
version=0.9.8i openssl_version=0.9.8
version=${openssl_version}j
distfiles="http://www.openssl.org/source/$pkgname-$version.tar.gz" distfiles="http://www.openssl.org/source/$pkgname-$version.tar.gz"
build_style=configure build_style=configure
configure_script="./Configure" configure_script="./config"
configure_args="--prefix=/usr configure_args="--prefix=/usr
--install_prefix=$XBPS_DESTDIR/$pkgname-$version --openssldir=/etc/ssl --install_prefix=$XBPS_DESTDIR/$pkgname-$version --openssldir=/etc/ssl
zlib-dynamic shared threads" zlib-dynamic shared threads"
make_build_target="all" make_build_target="all"
short_desc="Secure Socket Layer and cryptographic library" short_desc="Secure Socket Layer and cryptographic library"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
checksum=e8fc5fcfb715ffe925b2982aa9ca287832a93495d7fff03f17f6449f0732718c checksum=7131242042dbd631fbd83436f42aea1775e7c32f587fa4ada5a01df4c3ae8e8b
long_desc=" long_desc="
The OpenSSL Project is a collaborative effort to develop a robust, The OpenSSL Project is a collaborative effort to develop a robust,
commercial-grade, full-featured, and Open Source toolkit implementing the commercial-grade, full-featured, and Open Source toolkit implementing the
@ -24,14 +25,16 @@ conf_files="/etc/ssl/openssl.cnf"
build_depends="perl-5.10.0 zlib-1.2.3" build_depends="perl-5.10.0 zlib-1.2.3"
run_depends="glibc-2.8 zlib-1.2.3" run_depends="glibc-2.8 zlib-1.2.3"
if [ "$xbps_machine" = "x86_64" ]; then
configure_args="$configure_args linux-x86_64"
else
configure_args="$configure_args linux-elf"
fi
post_install() post_install()
{ {
local destdir="$XBPS_DESTDIR/$pkgname-$version"
# Grr. Stupid Makefile, remove stuff installed in wrong dir. # Grr. Stupid Makefile, remove stuff installed in wrong dir.
rm -rf $XBPS_DESTDIR/$pkgname-$version/usr/usr rm -rf $destdir/usr/usr
# Fix for correct SONAME in shared libs.
cd $destdir/usr/lib || exit 1
for f in libssl libcrypto; do
ln -sf $f.so.${openssl_version} $f.so.7
done
} }