wok-next rev 15969

openssl: up to 1.0.1f + add to ARM arch (almost rewrite receipt)
author Christophe Lincoln <pankso@slitaz.org>
date Mon Feb 24 23:42:48 2014 +0100 (2014-02-24)
parents 86575a4745f4
children 010bb8c2c4ac
files directfb/receipt libcrypto-dev/receipt libcrypto/receipt libssl/receipt libxcb-dev/receipt libxcb/receipt libxslt-dev/receipt libxslt/receipt openssl-dev/receipt openssl/receipt tslib/receipt xorg-xauth/receipt
line diff
     1.1 --- a/directfb/receipt	Mon Feb 24 21:03:12 2014 +0000
     1.2 +++ b/directfb/receipt	Mon Feb 24 23:42:48 2014 +0100
     1.3 @@ -10,18 +10,34 @@
     1.4  TARBALL="$SOURCE-$VERSION.tar.gz"
     1.5  WEB_SITE="http://www.directfb.org/"
     1.6  WGET_URL="http://www.directfb.org/downloads/Core/$SOURCE-1.4/$TARBALL"
     1.7 +HOST_ARCH="i486 arm"
     1.8  
     1.9  DEPENDS="libpng tslib"
    1.10  BUILD_DEPENDS="libpng-dev tslib-dev perl"
    1.11  
    1.12 +# Handle cross compilation.
    1.13 +case "$ARCH" in
    1.14 +	arm) 
    1.15 +		BUILD_DEPENDS="libpng-dev"
    1.16 +		CROSS_ARGS='LDFLAGS="-L/cross/arm/sysroot/usr/lib" \
    1.17 +			CPPFLAGS="-I/cross/arm/sysroot/usr/include"';;
    1.18 +esac
    1.19 +
    1.20 +# Handle SliTaz arch installation.
    1.21 +case "$SLITAZ_ARCH" in
    1.22 +	arm) DEPENDS="libpng" ;;
    1.23 +esac
    1.24 +
    1.25  # Rules to configure and make the package.
    1.26  compile_rules()
    1.27  {
    1.28  	cd $src
    1.29 -	./configure --prefix=/usr --sysconfdir=/etc --with-dither-rgb16=none \
    1.30 -		$CONFIGURE_ARGS &&
    1.31 -	make &&
    1.32 -	make DESTDIR=$DESTDIR install
    1.33 +	./configure \
    1.34 +		--prefix=/usr \
    1.35 +		--sysconfdir=/etc \
    1.36 +		--with-dither-rgb16=none \
    1.37 +		$CONFIGURE_ARGS $CROSS_ARGS &&
    1.38 +	make && make DESTDIR=$DESTDIR install
    1.39  }
    1.40  
    1.41  # Rules to gen a SliTaz package suitable for Tazpkg.
     2.1 --- a/libcrypto-dev/receipt	Mon Feb 24 21:03:12 2014 +0000
     2.2 +++ b/libcrypto-dev/receipt	Mon Feb 24 23:42:48 2014 +0100
     2.3 @@ -1,13 +1,14 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="libcrypto-dev"
     2.7 -VERSION="1.0.1a"
     2.8 +VERSION="1.0.1f"
     2.9  CATEGORY="development"
    2.10  SHORT_DESC="General purpose cryptographic shared library devel files."
    2.11  MAINTAINER="pascal.bellard@slitaz.org"
    2.12  LICENSE="BSD"
    2.13  WANTED="openssl"
    2.14  WEB_SITE="http://www.openssl.org/"
    2.15 +HOST_ARCH="i486 arm"
    2.16  
    2.17  DEPENDS="pkg-config"
    2.18  
     3.1 --- a/libcrypto/receipt	Mon Feb 24 21:03:12 2014 +0000
     3.2 +++ b/libcrypto/receipt	Mon Feb 24 23:42:48 2014 +0100
     3.3 @@ -1,13 +1,14 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="libcrypto"
     3.7 -VERSION="1.0.1a"
     3.8 +VERSION="1.0.1f"
     3.9  CATEGORY="security"
    3.10  SHORT_DESC="General purpose cryptographic shared library."
    3.11  MAINTAINER="pascal.bellard@slitaz.org"
    3.12  LICENSE="BSD"
    3.13  WANTED="openssl"
    3.14  WEB_SITE="http://www.openssl.org/"
    3.15 +HOST_ARCH="i486 arm"
    3.16  
    3.17  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.18  genpkg_rules()
     4.1 --- a/libssl/receipt	Mon Feb 24 21:03:12 2014 +0000
     4.2 +++ b/libssl/receipt	Mon Feb 24 23:42:48 2014 +0100
     4.3 @@ -1,13 +1,14 @@
     4.4  # SliTaz package receipt.
     4.5  
     4.6  PACKAGE="libssl"
     4.7 -VERSION="1.0.1a"
     4.8 +VERSION="1.0.1f"
     4.9  CATEGORY="security"
    4.10  SHORT_DESC="OpenSSL libraries."
    4.11  MAINTAINER="pascal.bellard@slitaz.org"
    4.12  LICENSE="BSD"
    4.13  WANTED="openssl"
    4.14  WEB_SITE="http://www.openssl.org/"
    4.15 +HOST_ARCH="i486 arm"
    4.16  
    4.17  DEPENDS="libcrypto"
    4.18  
     5.1 --- a/libxcb-dev/receipt	Mon Feb 24 21:03:12 2014 +0000
     5.2 +++ b/libxcb-dev/receipt	Mon Feb 24 23:42:48 2014 +0100
     5.3 @@ -7,6 +7,7 @@
     5.4  MAINTAINER="mallory@sweetpeople.org"
     5.5  LICENSE="other"
     5.6  WEB_SITE="http://xcb.freedesktop.org/"
     5.7 +HOST_ARCH="i486 arm"
     5.8  
     5.9  WANTED="libxcb"
    5.10  DEPENDS="libxcb xorg-libXau-dev xorg-libXdmcp-dev pkg-config"
     6.1 --- a/libxcb/receipt	Mon Feb 24 21:03:12 2014 +0000
     6.2 +++ b/libxcb/receipt	Mon Feb 24 23:42:48 2014 +0100
     6.3 @@ -4,16 +4,21 @@
     6.4  VERSION="1.9.1"
     6.5  CATEGORY="x-window"
     6.6  SHORT_DESC="A C binding to the X11 protocol"
     6.7 -MAINTAINER="mallory@sweetpeople.org"
     6.8 +MAINTAINER="pankso@slitaz.org"
     6.9  LICENSE="other"
    6.10  WEB_SITE="http://xcb.freedesktop.org/"
    6.11  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    6.12  WGET_URL="${WEB_SITE}dist/$TARBALL"
    6.13 +HOST_ARCH="i486 arm"
    6.14  
    6.15  DEPENDS="glibc-base xorg-libXau xorg-libXdmcp"
    6.16  BUILD_DEPENDS="libxslt-dev xcb-proto xorg-libXau-dev xorg-libXdmcp-dev \
    6.17  autoconf automake libtool"
    6.18  
    6.19 +case "$ARCH" in
    6.20 +	arm) BUILD_DEPENDS="libxslt-dev xcb-proto xorg-libXau-dev" ;;
    6.21 +esac
    6.22 +
    6.23  # Rules to configure and make the package.
    6.24  compile_rules()
    6.25  {
     7.1 --- a/libxslt-dev/receipt	Mon Feb 24 21:03:12 2014 +0000
     7.2 +++ b/libxslt-dev/receipt	Mon Feb 24 23:42:48 2014 +0100
     7.3 @@ -8,8 +8,9 @@
     7.4  LICENSE="MIT"
     7.5  WANTED="libxslt"
     7.6  WEB_SITE="http://xmlsoft.org/"
     7.7 +HOST_ARCH="i486 arm"
     7.8  
     7.9 -DEPENDS="libxslt libxslt-python libgcrypt-dev libxml2-dev zlib-dev pkg-config"
    7.10 +DEPENDS="libxslt libxslt-python libgcrypt-dev libxml2-dev zlib-dev"
    7.11  
    7.12  # Rules to gen a SliTaz package suitable for Tazpkg.
    7.13  genpkg_rules()
     8.1 --- a/libxslt/receipt	Mon Feb 24 21:03:12 2014 +0000
     8.2 +++ b/libxslt/receipt	Mon Feb 24 23:42:48 2014 +0100
     8.3 @@ -9,10 +9,15 @@
     8.4  TARBALL="$PACKAGE-$VERSION.tar.gz"
     8.5  WEB_SITE="http://www.xmlsoft.org/XSLT/"
     8.6  WGET_URL="ftp://xmlsoft.org/libxslt/$TARBALL"
     8.7 +HOST_ARCH="i486 arm"
     8.8  
     8.9  DEPENDS="libgcrypt libxml2 zlib"
    8.10  BUILD_DEPENDS="libgcrypt-dev libxml2-dev zlib-dev python-dev"
    8.11  
    8.12 +case "$ARCH" in
    8.13 +	arm) BUILD_DEPENDS="libxml2-dev" ;;
    8.14 +esac
    8.15 +
    8.16  # Rules to configure and make the package.
    8.17  compile_rules()
    8.18  {
     9.1 --- a/openssl-dev/receipt	Mon Feb 24 21:03:12 2014 +0000
     9.2 +++ b/openssl-dev/receipt	Mon Feb 24 23:42:48 2014 +0100
     9.3 @@ -1,13 +1,14 @@
     9.4  # SliTaz package receipt.
     9.5  
     9.6  PACKAGE="openssl-dev"
     9.7 -VERSION="1.0.1a"
     9.8 +VERSION="1.0.1f"
     9.9  CATEGORY="development"
    9.10  SHORT_DESC="Open source Secure Sockets Layer devel files."
    9.11  MAINTAINER="pascal.bellard@slitaz.org"
    9.12  LICENSE="BSD"
    9.13  WANTED="openssl"
    9.14  WEB_SITE="http://www.openssl.org/"
    9.15 +HOST_ARCH="i486 arm"
    9.16  
    9.17  DEPENDS="libcrypto-dev pkg-config"
    9.18  
    10.1 --- a/openssl/receipt	Mon Feb 24 21:03:12 2014 +0000
    10.2 +++ b/openssl/receipt	Mon Feb 24 23:42:48 2014 +0100
    10.3 @@ -1,7 +1,7 @@
    10.4  # SliTaz package receipt.
    10.5  
    10.6  PACKAGE="openssl"
    10.7 -VERSION="1.0.1a"
    10.8 +VERSION="1.0.1f"
    10.9  CATEGORY="security"
   10.10  SHORT_DESC="Open source Secure Sockets Layer."
   10.11  MAINTAINER="pascal.bellard@slitaz.org"
   10.12 @@ -10,32 +10,55 @@
   10.13  WEB_SITE="http://www.openssl.org/"
   10.14  WGET_URL="http://www.openssl.org/source/$TARBALL"
   10.15  TAGS="ssl security"
   10.16 +HOST_ARCH="i486 arm"
   10.17  
   10.18  DEPENDS="libcrypto libssl"
   10.19  BUILD_DEPENDS="perl zlib-dev"
   10.20  
   10.21 +# Perl is installed in cross env.
   10.22 +case "$ARCH" in
   10.23 +	arm) BUILD_DEPENDS="" ;;
   10.24 +esac
   10.25 +
   10.26  # Rules to configure and make the package.
   10.27  compile_rules()
   10.28  {
   10.29 -	cd $src
   10.30 -	
   10.31  	# MAKEFLAGS make openssl build fail.
   10.32  	unset MAKEFLAGS
   10.33  
   10.34  	# Add -Wa,--noexecstack here so that libcrypto's assembler modules will be
   10.35  	# marked as not requiring an executable stack (compatibility improvement).
   10.36 -	./config --prefix=/usr --openssldir=/etc/ssl shared zlib enable-md2 \
   10.37 -		-Wa,--noexecstack &&
   10.38 -	
   10.39 -	sed -i 's/\(basename .*\)`/\1 || true `/' Makefile &&
   10.40 -	make &&
   10.41 -	make INSTALL_PREFIX=$DESTDIR MANDIR=$DESTDIR/usr/share/man install
   10.42 +	case "$ARCH" in
   10.43 +		arm)
   10.44 +			# BUG: shared libs are not built
   10.45 +			./Configure --prefix=/usr --openssldir=/etc/ssl \
   10.46 +				 shared zlib enable-md2 -Wa,--noexecstack \
   10.47 +				 linux-armv4 &&
   10.48 +			sed -i 's/\(basename .*\)`/\1 || true `/' Makefile &&
   10.49 +			make \
   10.50 +				CC=${HOST_SYSTEM}-gcc \
   10.51 +				AR="${HOST_SYSTEM}-ar r" \
   10.52 +				RANLIB=${HOST_SYSTEM}-ranlib ;;
   10.53 +		i486)
   10.54 +			./config --prefix=/usr --openssldir=/etc/ssl shared zlib  \
   10.55 +				enable-md2 -Wa,--noexecstack &&
   10.56 +			sed -i 's/\(basename .*\)`/\1 || true `/' Makefile &&
   10.57 +			make ;;
   10.58 +	esac &&
   10.59 +	# Install
   10.60 +	make INSTALL_PREFIX=$DESTDIR MANDIR=/usr/share/man install
   10.61  }
   10.62  
   10.63  # Rules to gen a SliTaz package suitable for Tazpkg.
   10.64  genpkg_rules()
   10.65  {
   10.66 -	mkdir -p $fs/usr
   10.67 +	mkdir -p $fs/usr/lib
   10.68  	cp -a $install/etc $fs
   10.69  	cp -a $install/usr/bin $fs/usr
   10.70 +	cp -a $install/usr/lib/engines $fs/usr/lib
   10.71  }
   10.72 +
   10.73 +testsuite()
   10.74 +{
   10.75 +	readelf -h $install/usr/bin/openssl
   10.76 +}
    11.1 --- a/tslib/receipt	Mon Feb 24 21:03:12 2014 +0000
    11.2 +++ b/tslib/receipt	Mon Feb 24 23:42:48 2014 +0100
    11.3 @@ -15,11 +15,11 @@
    11.4  # Rules to configure and make the package.
    11.5  compile_rules()
    11.6  {
    11.7 -	cd $src
    11.8  	./autogen.sh
    11.9 -	./configure --prefix=/usr --infodir=/usr/share/info \
   11.10 +	./configure \
   11.11 +		--prefix=/usr \
   11.12 +		--infodir=/usr/share/info \
   11.13  		--sysconfdir=/etc \
   11.14 -		--mandir=/usr/share/man \
   11.15  		$CONFIGURE_ARGS &&
   11.16  	make &&
   11.17  	make DESTDIR=$DESTDIR install
    12.1 --- a/xorg-xauth/receipt	Mon Feb 24 21:03:12 2014 +0000
    12.2 +++ b/xorg-xauth/receipt	Mon Feb 24 23:42:48 2014 +0100
    12.3 @@ -10,10 +10,15 @@
    12.4  TARBALL="$SOURCE-$VERSION.tar.bz2"
    12.5  WEB_SITE="http://www.x.org/"
    12.6  WGET_URL="$XORG_MIRROR/app/$TARBALL"
    12.7 +HOST_ARCH="i486 arm"
    12.8  
    12.9  DEPENDS="xorg-libXmu"
   12.10  BUILD_DEPENDS="xorg-libXmu-dev"
   12.11  
   12.12 +case "$ARCH" in
   12.13 +	arm) BUILD_DEPENDS="xorg-xproto xorg-libXau-dev" ;;
   12.14 +esac
   12.15 +
   12.16  # Rules to configure and make the package.
   12.17  compile_rules()
   12.18  {