snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

openssl: update to 1.0.0, bump abi_depends. 

--HG--
extra : convert_revision : 05ffce8cf6e39227869ff1d91a8852bca1c5d8c3
This commit is contained in:
Juan RP 2010-04-09 18:26:37 +02:00
parent 8ab206f599
commit acd00daf7f
8 changed files with 1950 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
srcpkgs/openssl/depends
View File

@ -1,2 +1,2 @@
abi_depends=">=0.9.8"
abi_depends=">=1.0.0"
api_depends="${abi_depends}"

8
srcpkgs/openssl/openssl-devel.template
View File

@ -5,7 +5,8 @@ long_desc="${long_desc}
This package contains files for development, headers, static libs, etc."
Add_dependency run glibc-devel
Add_dependency run perl
Add_dependency run zlib-devel
Add_dependency run openssl
do_install()
@ -17,10 +18,5 @@ do_install()
mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
# Rename conflicting manpages
for f in err rand threads; do
mv ${SRCPKGDESTDIR}/usr/share/man/man3/${f}.3 \
${SRCPKGDESTDIR}/usr/share/man/man3/openssl-${f}.3
done
mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
}

33
srcpkgs/openssl/patches/ca-dir.patch Normal file
View File

@ -0,0 +1,33 @@
--- apps/CA.pl.in 2006-04-28 02:30:49.000000000 +0200
+++ apps/CA.pl.in 2010-04-01 00:35:02.600553509 +0200
@@ -53,7 +53,7 @@
$X509="$openssl x509";
$PKCS12="$openssl pkcs12";
-$CATOP="./demoCA";
+$CATOP="/etc/ssl";
$CAKEY="cakey.pem";
$CAREQ="careq.pem";
$CACERT="cacert.pem";
--- apps/CA.sh 2009-10-15 19:27:47.000000000 +0200
+++ apps/CA.sh 2010-04-01 00:35:02.600553509 +0200
@@ -68,7 +68,7 @@
X509="$OPENSSL x509"
PKCS12="openssl pkcs12"
-if [ -z "$CATOP" ] ; then CATOP=./demoCA ; fi
+if [ -z "$CATOP" ] ; then CATOP=/etc/ssl ; fi
CAKEY=./cakey.pem
CAREQ=./careq.pem
CACERT=./cacert.pem
--- apps/openssl.cnf 2009-04-04 20:09:43.000000000 +0200
+++ apps/openssl.cnf 2010-04-01 00:35:02.607220681 +0200
@@ -39,7 +39,7 @@
####################################################################
[ CA_default ]
-dir = ./demoCA # Where everything is kept
+dir = /etc/ssl # Where everything is kept
certs = $dir/certs # Where the issued certs are kept
crl_dir = $dir/crl # Where the issued crl are kept
database = $dir/index.txt # database index file.

1887
srcpkgs/openssl/patches/fix-manpages.patch Normal file
View File

File diff suppressed because it is too large Load Diff

17
srcpkgs/openssl/patches/fix-soname-and-rpath.patch Normal file
View File

@ -0,0 +1,17 @@
Do not hardcode rpath into binaries and do not use full version for
the soname, just the major version.
--- Makefile.shared.orig 2010-04-09 15:36:01.171506321 +0200
+++ Makefile.shared 2010-04-09 15:41:25.848516655 +0200
@@ -151,9 +151,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.1$$SHLIB_SUFFIX"
-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

11
srcpkgs/openssl/patches/fix_mandir_path.diff
View File

@ -1,11 +0,0 @@
--- Makefile.org.orig 2008-10-24 06:41:08.000000000 +0200
+++ Makefile.org 2008-10-24 06:41:24.000000000 +0200
@@ -125,7 +125,7 @@ TESTS = alltests
MAKEFILE= Makefile
-MANDIR=$(OPENSSLDIR)/man
+MANDIR=$(INSTALLTOP)/share/man
MAN1=1
MAN3=3
MANSUFFIX=

23
srcpkgs/openssl/patches/fix_sharedlib.diff
View File

@ -1,23 +0,0 @@
--- 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

26
srcpkgs/openssl/template
View File

@ -1,17 +1,17 @@
# Template file for 'openssl'
pkgname=openssl
openssl_version=0.9.8
version=${openssl_version}n
_openssl_version=1.0.0
version=${_openssl_version}
distfiles="http://www.openssl.org/source/$pkgname-$version.tar.gz"
build_style=configure
configure_script="./config"
configure_args="--prefix=/usr
--install_prefix=$XBPS_DESTDIR/$pkgname-$version --openssldir=/etc/ssl
zlib-dynamic shared threads"
make_build_target="all"
configure_args="--prefix=/usr --openssldir=/etc/ssl --libdir=lib
zlib shared threads -Wa,--noexecstack"
make_install_target="INSTALL_PREFIX=$XBPS_DESTDIR/$pkgname-$version
MANDIR=/usr/share/man install"
short_desc="Secure Socket Layer and cryptographic library"
maintainer="Juan RP <xtraeme@gmail.com>"
checksum=b01abc28376b866515df58f1b004da8453166291783d4e7477cda89b000c1f01
checksum=1bbf9afc5a6215121ac094147d0a84178294fe4c3d0a231731038fd3717ba7ca
long_desc="
The OpenSSL Project is a collaborative effort to develop a robust,
commercial-grade, full-featured, and Open Source toolkit implementing the
@ -30,14 +30,8 @@ Add_dependency build zlib-devel
post_install()
{
# Grr. Stupid Makefile, remove stuff installed in wrong dir.
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
for _solib_ in libssl.so libcrypto.so; do
cd ${DESTDIR}/usr/lib && \
ln -s ${_solib_}.${version} ${_solib_}.1
done
# Remove passwd.1 manpage, it's supplied by the shadow pkg.
rm -f ${DESTDIR}/usr/share/man/man1/passwd.1
}