# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1393281768 -3600
# Node ID fd812ac904525ce98c10b870db4236ae7a024f1b
# Parent  86575a4745f48ebb516e293ffb48a18e2f06db49
openssl: up to 1.0.1f + add to ARM arch (almost rewrite receipt)

diff -r 86575a4745f4 -r fd812ac90452 directfb/receipt
--- a/directfb/receipt	Mon Feb 24 21:03:12 2014 +0000
+++ b/directfb/receipt	Mon Feb 24 23:42:48 2014 +0100
@@ -10,18 +10,34 @@
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://www.directfb.org/"
 WGET_URL="http://www.directfb.org/downloads/Core/$SOURCE-1.4/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="libpng tslib"
 BUILD_DEPENDS="libpng-dev tslib-dev perl"
 
+# Handle cross compilation.
+case "$ARCH" in
+	arm) 
+		BUILD_DEPENDS="libpng-dev"
+		CROSS_ARGS='LDFLAGS="-L/cross/arm/sysroot/usr/lib" \
+			CPPFLAGS="-I/cross/arm/sysroot/usr/include"';;
+esac
+
+# Handle SliTaz arch installation.
+case "$SLITAZ_ARCH" in
+	arm) DEPENDS="libpng" ;;
+esac
+
 # Rules to configure and make the package.
 compile_rules()
 {
 	cd $src
-	./configure --prefix=/usr --sysconfdir=/etc --with-dither-rgb16=none \
-		$CONFIGURE_ARGS &&
-	make &&
-	make DESTDIR=$DESTDIR install
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--with-dither-rgb16=none \
+		$CONFIGURE_ARGS $CROSS_ARGS &&
+	make && make DESTDIR=$DESTDIR install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 86575a4745f4 -r fd812ac90452 libcrypto-dev/receipt
--- a/libcrypto-dev/receipt	Mon Feb 24 21:03:12 2014 +0000
+++ b/libcrypto-dev/receipt	Mon Feb 24 23:42:48 2014 +0100
@@ -1,13 +1,14 @@
 # SliTaz package receipt.
 
 PACKAGE="libcrypto-dev"
-VERSION="1.0.1a"
+VERSION="1.0.1f"
 CATEGORY="development"
 SHORT_DESC="General purpose cryptographic shared library devel files."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WANTED="openssl"
 WEB_SITE="http://www.openssl.org/"
+HOST_ARCH="i486 arm"
 
 DEPENDS="pkg-config"
 
diff -r 86575a4745f4 -r fd812ac90452 libcrypto/receipt
--- a/libcrypto/receipt	Mon Feb 24 21:03:12 2014 +0000
+++ b/libcrypto/receipt	Mon Feb 24 23:42:48 2014 +0100
@@ -1,13 +1,14 @@
 # SliTaz package receipt.
 
 PACKAGE="libcrypto"
-VERSION="1.0.1a"
+VERSION="1.0.1f"
 CATEGORY="security"
 SHORT_DESC="General purpose cryptographic shared library."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WANTED="openssl"
 WEB_SITE="http://www.openssl.org/"
+HOST_ARCH="i486 arm"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 86575a4745f4 -r fd812ac90452 libssl/receipt
--- a/libssl/receipt	Mon Feb 24 21:03:12 2014 +0000
+++ b/libssl/receipt	Mon Feb 24 23:42:48 2014 +0100
@@ -1,13 +1,14 @@
 # SliTaz package receipt.
 
 PACKAGE="libssl"
-VERSION="1.0.1a"
+VERSION="1.0.1f"
 CATEGORY="security"
 SHORT_DESC="OpenSSL libraries."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WANTED="openssl"
 WEB_SITE="http://www.openssl.org/"
+HOST_ARCH="i486 arm"
 
 DEPENDS="libcrypto"
 
diff -r 86575a4745f4 -r fd812ac90452 libxcb-dev/receipt
--- a/libxcb-dev/receipt	Mon Feb 24 21:03:12 2014 +0000
+++ b/libxcb-dev/receipt	Mon Feb 24 23:42:48 2014 +0100
@@ -7,6 +7,7 @@
 MAINTAINER="mallory@sweetpeople.org"
 LICENSE="other"
 WEB_SITE="http://xcb.freedesktop.org/"
+HOST_ARCH="i486 arm"
 
 WANTED="libxcb"
 DEPENDS="libxcb xorg-libXau-dev xorg-libXdmcp-dev pkg-config"
diff -r 86575a4745f4 -r fd812ac90452 libxcb/receipt
--- a/libxcb/receipt	Mon Feb 24 21:03:12 2014 +0000
+++ b/libxcb/receipt	Mon Feb 24 23:42:48 2014 +0100
@@ -4,16 +4,21 @@
 VERSION="1.9.1"
 CATEGORY="x-window"
 SHORT_DESC="A C binding to the X11 protocol"
-MAINTAINER="mallory@sweetpeople.org"
+MAINTAINER="pankso@slitaz.org"
 LICENSE="other"
 WEB_SITE="http://xcb.freedesktop.org/"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="${WEB_SITE}dist/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="glibc-base xorg-libXau xorg-libXdmcp"
 BUILD_DEPENDS="libxslt-dev xcb-proto xorg-libXau-dev xorg-libXdmcp-dev \
 autoconf automake libtool"
 
+case "$ARCH" in
+	arm) BUILD_DEPENDS="libxslt-dev xcb-proto xorg-libXau-dev" ;;
+esac
+
 # Rules to configure and make the package.
 compile_rules()
 {
diff -r 86575a4745f4 -r fd812ac90452 libxslt-dev/receipt
--- a/libxslt-dev/receipt	Mon Feb 24 21:03:12 2014 +0000
+++ b/libxslt-dev/receipt	Mon Feb 24 23:42:48 2014 +0100
@@ -8,8 +8,9 @@
 LICENSE="MIT"
 WANTED="libxslt"
 WEB_SITE="http://xmlsoft.org/"
+HOST_ARCH="i486 arm"
 
-DEPENDS="libxslt libxslt-python libgcrypt-dev libxml2-dev zlib-dev pkg-config"
+DEPENDS="libxslt libxslt-python libgcrypt-dev libxml2-dev zlib-dev"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 86575a4745f4 -r fd812ac90452 libxslt/receipt
--- a/libxslt/receipt	Mon Feb 24 21:03:12 2014 +0000
+++ b/libxslt/receipt	Mon Feb 24 23:42:48 2014 +0100
@@ -9,10 +9,15 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.xmlsoft.org/XSLT/"
 WGET_URL="ftp://xmlsoft.org/libxslt/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="libgcrypt libxml2 zlib"
 BUILD_DEPENDS="libgcrypt-dev libxml2-dev zlib-dev python-dev"
 
+case "$ARCH" in
+	arm) BUILD_DEPENDS="libxml2-dev" ;;
+esac
+
 # Rules to configure and make the package.
 compile_rules()
 {
diff -r 86575a4745f4 -r fd812ac90452 openssl-dev/receipt
--- a/openssl-dev/receipt	Mon Feb 24 21:03:12 2014 +0000
+++ b/openssl-dev/receipt	Mon Feb 24 23:42:48 2014 +0100
@@ -1,13 +1,14 @@
 # SliTaz package receipt.
 
 PACKAGE="openssl-dev"
-VERSION="1.0.1a"
+VERSION="1.0.1f"
 CATEGORY="development"
 SHORT_DESC="Open source Secure Sockets Layer devel files."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="BSD"
 WANTED="openssl"
 WEB_SITE="http://www.openssl.org/"
+HOST_ARCH="i486 arm"
 
 DEPENDS="libcrypto-dev pkg-config"
 
diff -r 86575a4745f4 -r fd812ac90452 openssl/receipt
--- a/openssl/receipt	Mon Feb 24 21:03:12 2014 +0000
+++ b/openssl/receipt	Mon Feb 24 23:42:48 2014 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="openssl"
-VERSION="1.0.1a"
+VERSION="1.0.1f"
 CATEGORY="security"
 SHORT_DESC="Open source Secure Sockets Layer."
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -10,32 +10,55 @@
 WEB_SITE="http://www.openssl.org/"
 WGET_URL="http://www.openssl.org/source/$TARBALL"
 TAGS="ssl security"
+HOST_ARCH="i486 arm"
 
 DEPENDS="libcrypto libssl"
 BUILD_DEPENDS="perl zlib-dev"
 
+# Perl is installed in cross env.
+case "$ARCH" in
+	arm) BUILD_DEPENDS="" ;;
+esac
+
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	
 	# MAKEFLAGS make openssl build fail.
 	unset MAKEFLAGS
 
 	# Add -Wa,--noexecstack here so that libcrypto's assembler modules will be
 	# marked as not requiring an executable stack (compatibility improvement).
-	./config --prefix=/usr --openssldir=/etc/ssl shared zlib enable-md2 \
-		-Wa,--noexecstack &&
-	
-	sed -i 's/\(basename .*\)`/\1 || true `/' Makefile &&
-	make &&
-	make INSTALL_PREFIX=$DESTDIR MANDIR=$DESTDIR/usr/share/man install
+	case "$ARCH" in
+		arm)
+			# BUG: shared libs are not built
+			./Configure --prefix=/usr --openssldir=/etc/ssl \
+				 shared zlib enable-md2 -Wa,--noexecstack \
+				 linux-armv4 &&
+			sed -i 's/\(basename .*\)`/\1 || true `/' Makefile &&
+			make \
+				CC=${HOST_SYSTEM}-gcc \
+				AR="${HOST_SYSTEM}-ar r" \
+				RANLIB=${HOST_SYSTEM}-ranlib ;;
+		i486)
+			./config --prefix=/usr --openssldir=/etc/ssl shared zlib  \
+				enable-md2 -Wa,--noexecstack &&
+			sed -i 's/\(basename .*\)`/\1 || true `/' Makefile &&
+			make ;;
+	esac &&
+	# Install
+	make INSTALL_PREFIX=$DESTDIR MANDIR=/usr/share/man install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
-	mkdir -p $fs/usr
+	mkdir -p $fs/usr/lib
 	cp -a $install/etc $fs
 	cp -a $install/usr/bin $fs/usr
+	cp -a $install/usr/lib/engines $fs/usr/lib
 }
+
+testsuite()
+{
+	readelf -h $install/usr/bin/openssl
+}
diff -r 86575a4745f4 -r fd812ac90452 tslib/receipt
--- a/tslib/receipt	Mon Feb 24 21:03:12 2014 +0000
+++ b/tslib/receipt	Mon Feb 24 23:42:48 2014 +0100
@@ -15,11 +15,11 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./autogen.sh
-	./configure --prefix=/usr --infodir=/usr/share/info \
+	./configure \
+		--prefix=/usr \
+		--infodir=/usr/share/info \
 		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
 	make &&
 	make DESTDIR=$DESTDIR install
diff -r 86575a4745f4 -r fd812ac90452 xorg-xauth/receipt
--- a/xorg-xauth/receipt	Mon Feb 24 21:03:12 2014 +0000
+++ b/xorg-xauth/receipt	Mon Feb 24 23:42:48 2014 +0100
@@ -10,10 +10,15 @@
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://www.x.org/"
 WGET_URL="$XORG_MIRROR/app/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libXmu"
 BUILD_DEPENDS="xorg-libXmu-dev"
 
+case "$ARCH" in
+	arm) BUILD_DEPENDS="xorg-xproto xorg-libXau-dev" ;;
+esac
+
 # Rules to configure and make the package.
 compile_rules()
 {