Fix crypto/bigint_impl.h so curl can build against axtls

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 214 insertions, 6 deletions

diff --git a/net-libs/axtls/ChangeLog b/net-libs/axtls/ChangeLog
index 2b154c57d3a3..6800b54ebff7 100644
--- a/net-libs/axtls/ChangeLog
+++ b/net-libs/axtls/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-libs/axtls
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/ChangeLog,v 1.2 2012/05/29 07:47:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/ChangeLog,v 1.3 2012/06/07 00:13:29 blueness Exp $
+
+*axtls-1.4.6-r1 (07 Jun 2012)
+
+  07 Jun 2012; Anthony G. Basile <blueness@gentoo.org> +axtls-1.4.6-r1.ebuild,
+  +files/bigint_impl.h-add-missing-include.patch:
+  Fix crypto/bigint_impl.h so curl can build against axtls
+  https://sourceforge.net/tracker/?func=detail&aid=3515628&group_id=171217&atid
+  =857113
+  https://sourceforge.net/tracker/?func=detail&aid=3532467&group_id=171217&atid
+  =857113
 
   29 May 2012; Jeroen Roovers <jer@gentoo.org> axtls-1.4.6.ebuild:
   Marked ~hppa too.
diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest
index 1469ba22a3cb..7eff1d2cd7ca 100644
--- a/net-libs/axtls/Manifest
+++ b/net-libs/axtls/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX axhttpd.confd 181 RMD160 489c7d0ff59a419061bcc246e1ca1ced1cfe2831 SHA1 4378b0ec8b8634af29a62c49603ec5ccc14da693 SHA256 5eff31a8656c735ec9b85eac8d0a92c497132d5337fd5dff6f9e311e6b223a65
 AUX axhttpd.initd 625 RMD160 c61494de1ff76d6a4e8591e460667efacd9f2b0b SHA1 1ba055001658a96c9a927c47edb05def1840694b SHA256 90a816f0807478d02e4b74d8532e3deda8cfe844980dadd8662e1969acf7217d
+AUX bigint_impl.h-add-missing-include.patch 891 RMD160 dd2254c099733e58f95b0cf00869c0c63494b74a SHA1 36ec04c2899b6cd63e789ab4ea09ee2bce0d9097 SHA256 223ff3221f7a4394cc47dcfedcbdc8abf638ae60d90d1382cdf6a51d793212d4
 AUX config 3064 RMD160 5087b627e11d34a81c8696022d2380faa244b8e2 SHA1 095708bd3c5fc4e3183e9f9857139d0e211d42a6 SHA256 e85c8bd84f34045b52cefc7e3df94373f87cab22d495efe7ca737b1e6cfaa7ed
 DIST axTLS-1.4.6.tar.gz 1299349 RMD160 291c7c0e43bc278a712bcad557187417f4813d31 SHA1 611a6a549b2842cd5e78e3ced4556264f17aef43 SHA256 43ad99c1cb205bc0275637fd14094a2034e168cdd6f18f377e007abdbb233619
+EBUILD axtls-1.4.6-r1.ebuild 4399 RMD160 34b59e2df9932bd09eb521100f08b610d8d9ef39 SHA1 4bc6cb7d241f1032a8320f26af458330cc50afc4 SHA256 4420dec459d669d8f7e3dc2853760383eeb2543af216f4bef38c0f816b0c3dfe
 EBUILD axtls-1.4.6.ebuild 4321 RMD160 22e08cac4eab32e2daaae8b1c6b705a1cefd43c6 SHA1 0bad271153ce9da4723a70c54c11fa42d752b654 SHA256 82ef30282951514401206c144aaede572c9ba4a56d4cdac76871482bf5e13c9f
-MISC ChangeLog 1219 RMD160 e9f739a2f507898d34b46485b26a0e1c9609b4fb SHA1 8b6c3f87762ffa59cef57f0dc2daba99b63bfc0f SHA256 fa6c696095d463d95744b2dc32cd3360092742c474534ec68df23f47acfd2bb8
+MISC ChangeLog 1624 RMD160 378db5c5f41a45292d6d64b23a0c3ca1c4747066 SHA1 29ea2c8dc44b17dfba9c1f0bd406f65607c41541 SHA256 9a2d79fd2caa0f12c1bc49a40c7abe26cf335641cc50dbb4f795b4dbf98b57c0
 MISC metadata.xml 539 RMD160 66d2200563130d8af1e6b9ea42aac0098cca0ece SHA1 977793dc0d626b3c9144cdac6e85ec137efd3e72 SHA256 678ce846bdfbf9df350ed0ba25520abe1588a12c229cbc54642269cf2fbe0966
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk/Efx0ACgkQVWmRsqeSphOfBQCeOu6lXPAw8vfwR0OIM9wkp0D9
-C3EAnikKxiKBfdg0ADzBAiBGn7VaaPPp
-=SXav
+iEYEAREIAAYFAk/P8jMACgkQl5yvQNBFVTUjKQCfZHKmbdRqilCprJ25WFoBB8nP
+kMQAnjQ10cnMj69DNbwNvIJQwIxWb5KQ
+=xzeg
 -----END PGP SIGNATURE-----
diff --git a/net-libs/axtls/axtls-1.4.6-r1.ebuild b/net-libs/axtls/axtls-1.4.6-r1.ebuild
new file mode 100644
index 000000000000..f3a4b68d014f
--- /dev/null
+++ b/net-libs/axtls/axtls-1.4.6-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/axtls-1.4.6-r1.ebuild,v 1.1 2012/06/07 00:13:28 blueness Exp $
+
+EAPI="4"
+
+inherit eutils savedconfig toolchain-funcs user
+
+################################################################################
+# axtls CONFIG MINI-HOWTO
+#
+# Note: axtls is highly configurable and uses mconf, like the linux kernel.
+# You can configure it in a couple of ways:
+#
+# 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
+# you want, and possibly a lot more.
+#
+# 2) You can create your own configuration file by doing
+#
+#	FEATURES="keepwork" USE="savedconfig -*" emerge axtls
+#	cd /var/tmp/portage/net-libs/axtls*/work/axTLS
+#	make menuconfig
+#
+# Now configure axtls as you want.  Finally save your config file:
+#
+#	cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
+#
+# where ${PV} is the current version.  You can then run emerge again with
+# your configuration by doing
+#
+#	USE="savedconfig" emerge axtls
+#
+################################################################################
+
+MY_PN=${PN/tls/TLS}
+
+DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
+HOMEPAGE="http://axtls.sourceforge.net/"
+SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="httpd cgi-lua cgi-php static doc"
+
+# TODO: add ipv6, and c#, java, lua, perl bindings
+# Currently these all have some issue
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND="
+	httpd? (
+		cgi-lua? ( dev-lang/lua )
+		cgi-php? ( dev-lang/php[cgi] )
+	)"
+
+#Note1: static, cgi-* makes no sense if httpd is not given
+REQUIRED_USE="
+	static? ( httpd )
+	cgi-lua? ( httpd )
+	cgi-php? ( httpd )"
+
+AXTLS_GROUP="axtls"
+AXTLS_USER="axtls"
+
+pkg_setup() {
+	use httpd && {
+		ebegin "Creating axtls user and group"
+		enewgroup ${AXTLS_GROUP}
+		enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
+	}
+}
+
+src_prepare() {
+	tc-export CC
+
+	epatch "${FILESDIR}/bigint_impl.h-add-missing-include.patch"
+
+	#Use CC as the host compiler for mconf
+	sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
+		"${S}"/config/Rules.mak
+
+	#We want CONFIG_DEBUG to avoid stripping
+	#but not for debugging info
+	sed -i -e 's: -g::' \
+		"${S}"/config/Rules.mak
+	sed -i -e 's: -g::' \
+		"${S}"/config/makefile.conf
+}
+
+use_flag_config() {
+	cp "${FILESDIR}"/config "${S}"/config/.config
+
+	#Respect CFLAGS/LDFLAGS
+	sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
+		"${S}"/config/.config
+	sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDLAGS}\":" \
+		"${S}"/config/.config
+
+	#The logic is that the default config file enables everything and we disable
+	#here with sed unless a USE flags says to keep it
+	if use httpd; then
+		if ! use static; then
+			sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
+				"${S}"/config/.config
+		fi
+		if ! use cgi-php && ! use cgi-lua; then
+			sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
+				"${S}"/config/.config
+		fi
+		if ! use cgi-php; then
+			sed -i -e 's:,.php::' "${S}"/config/.config
+		fi
+		if ! use cgi-lua; then
+			sed -i -e 's:\.lua,::' \
+				-e 's:lua:php:' \
+				-e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
+				"${S}"/config/.config
+		fi
+	else
+		sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
+			"${S}"/config/.config
+	fi
+
+	yes "n" | emake -j1 oldconfig > /dev/null
+}
+
+src_configure() {
+	tc-export CC
+
+	if use savedconfig; then
+		restore_config config/.config
+		if [ -f config/.config ]; then
+			ewarn "Using saved config, all other USE flags ignored"
+		else
+			ewarn "No saved config, seeding with the default"
+			cp "${FILESDIR}"/config "${S}"/config/.config
+		fi
+		yes "" | emake -j1 oldconfig > /dev/null
+	else
+		use_flag_config
+	fi
+}
+
+src_compile() {
+	default
+	if use doc; then
+		emake docs
+		mv www README
+	fi
+}
+
+src_install() {
+	if use savedconfig; then
+		save_config config/.config
+	fi
+
+	emake PREFIX="${ED}/usr" install
+	if [ -f "${ED}"/usr/bin/htpasswd ]; then
+		mv "${ED}"/usr/bin/{,ax}htpasswd
+	fi
+
+	if use httpd; then
+		newinitd "${FILESDIR}"/axhttpd.initd axhttpd
+		newconfd "${FILESDIR}"/axhttpd.confd axhttpd
+	fi
+
+	docompress -x /usr/share/doc/${PF}/README
+	dodoc -r README
+
+	if use doc; then
+		dodoc -r docsrc/html
+	fi
+}
diff --git a/net-libs/axtls/files/bigint_impl.h-add-missing-include.patch b/net-libs/axtls/files/bigint_impl.h-add-missing-include.patch
new file mode 100644
index 000000000000..1e29aca71482
--- /dev/null
+++ b/net-libs/axtls/files/bigint_impl.h-add-missing-include.patch
@@ -0,0 +1,23 @@
+crypto/bigint_impl.h: missing #include <stdint.h>
+
+bigint_impl.h typedefs uint16_t and uint32_t but never
+includes the headers where those are defined. On a standard
+gnu/linux system that means you need #include <stdint.h>.
+I hit this error when compiling curl --with-axtls and
+adding the include fixed the compile time error.
+
+See:
+https://sourceforge.net/tracker/?func=detail&aid=3515628&group_id=171217&atid=857113
+https://sourceforge.net/tracker/?func=detail&aid=3532467&group_id=171217&atid=857113
+
+--- crypto/bigint_impl.h.orig	2012-04-07 01:10:24.000000000 -0400
++++ crypto/bigint_impl.h	2012-04-06 23:00:22.000000000 -0400
+@@ -31,6 +31,8 @@
+ #ifndef BIGINT_IMPL_HEADER
+ #define BIGINT_IMPL_HEADER
+ 
++#include <stdint.h>
++
+ /* Maintain a number of precomputed variables when doing reduction */
+ #define BIGINT_M_OFFSET     0    /**< Normal modulo offset. */
+ #ifdef CONFIG_BIGINT_CRT