Version bump, fixes locations of SSL/TLS version number (RFC5246) to work with Chrome

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 206 insertions, 7 deletions

diff --git a/net-libs/axtls/ChangeLog b/net-libs/axtls/ChangeLog
index b91e6345f5ae..e5ce3a7820d0 100644
--- a/net-libs/axtls/ChangeLog
+++ b/net-libs/axtls/ChangeLog
@@ -1,6 +1,12 @@
 # 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.16 2012/09/23 08:09:43 phajdan.jr Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/ChangeLog,v 1.17 2013/01/07 00:01:07 blueness Exp $
+
+*axtls-1.4.9 (07 Jan 2013)
+
+  07 Jan 2013; Anthony G. Basile <blueness@gentoo.org> +axtls-1.4.9.ebuild:
+  Version bump, fixes locations of SSL/TLS version number (RFC5246) to work with
+  Chrome
 
   23 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> axtls-1.4.8.ebuild:
   x86 stable wrt bug #429168
@@ -82,4 +88,3 @@
   06 Apr 2012; Anthony G. Basile <blueness@gentoo.org> +axTLS-1.4.5.ebuild,
   +files/axhttpd.confd, +files/axhttpd.initd, +files/config, +metadata.xml:
   Initial commit
-
diff --git a/net-libs/axtls/Manifest b/net-libs/axtls/Manifest
index dcd3c563f8f7..92ffcfbdf7e7 100644
--- a/net-libs/axtls/Manifest
+++ b/net-libs/axtls/Manifest
@@ -8,14 +8,26 @@ AUX config 3064 SHA256 e85c8bd84f34045b52cefc7e3df94373f87cab22d495efe7ca737b1e6
 AUX explicit-libdir.patch 1141 SHA256 a12f357937f2d2c791df3d5adce2a2713ee7914b86b91c341fec094b75b2cf45 SHA512 e71380b8495c859530a3aa8487747095d7bea9ef40212021e853ba2ce1bddaa7417954bb794fdc5e91dd0cc5f9cdb80031925dda0d3b4f9ef57c524b45c49fa7 WHIRLPOOL ad0f38e5b35047687177406fb351333b2b1e1de8a6ab406827bea58202f6f5f80b1dbe4f5c1c8b56189e4e65f39fcb508b230e14570314ad8fec31e8f27d4478
 DIST axTLS-1.4.6.tar.gz 1299349 SHA256 43ad99c1cb205bc0275637fd14094a2034e168cdd6f18f377e007abdbb233619 SHA512 e0ceb15c902722f779ea200d1f8cfd765dc17b535348e9ecf1c5a87722b7df780899d144b9e951f614238adeb3a8d0682eac61aaa27f0bffc9dacdbd99839a28 WHIRLPOOL c67551e1bfa384ada625fb6656ed294e0926c4c20effcf48be2ded69dd37a140efea906a8debfabab1d1d71ab687a690c34653d30f14114dfe6127f4bba37293
 DIST axTLS-1.4.8.tar.gz 1298539 SHA256 e2679c8b42a840a9df8fef03a306b65fe06b43f72b2f6ef9acc181488e145cdf SHA512 7294b03d546263dd904df7cc9c080e496562838165ffef23f336eb77e1b5f45b65fada418a59f07d2171177deafa844d70a9a92970443e607d565493678a242c WHIRLPOOL 49eece3ce09207df9fd7c3baa40f7a983a2e7aedef9967dfffee2aba5e585236e669c12cfb2a16310d8e679567e36261b42f594d97a6f65b7b23bba732d27a86
+DIST axTLS-1.4.9.tar.gz 1300593 SHA256 9bc08f4c7a6bda3079af8e3f5ceee6b2ee92af34e8efbc9acfeee6c27b1f7cc3 SHA512 006a8c08c29f22e3992df9ccd94e19d5e98a6a350cf23c53710d72d3aba9f7375bad74124e5f09864c1cf193c592013dfccff3ba86ece496e5c0b85a771acef4 WHIRLPOOL a3c3d3ffa89a72f49ba7c8c3b11b471668253f9e3e07865558634c3b4dc7cb15f4bb4e7bbee34a4b3e9602dda13b31482082c367ff4cea97b3edec2a7cb973e1
 EBUILD axtls-1.4.6-r1.ebuild 4653 SHA256 ddf4b52626f9e2c9a4c2e1537ac4318fd6c2ec5b1651d9f5470d49bab9158c71 SHA512 59b26f5e4ae3af259d95284ee48e1ef3d93ee011121ad11bb864bff8b5e301cc96c8e9e1a4939134a16bce01c24f386ba49c19cd85134838c4a0dd704f7b4d4c WHIRLPOOL 8b0612d249a7b6c67105238648495da8584b3b9febd7a6e66f566c190576ba440d17314abb24f674ee632177a45ff09713d72999db97aa9aa45cba3575dd448b
 EBUILD axtls-1.4.8.ebuild 4590 SHA256 ba848742b31983b2a689aab8509476f381f13c5596f835ee81d75784a95facc6 SHA512 614e14911e33b5f5f5555d8b1f720907cefe1b4c0b6f1f244b76bf556e919d85b500d3038cfd46715a60a033e0034dd307684b5011a811f6f9e6f6cb3e07b8c4 WHIRLPOOL 5da12ccd5222cd7716eba4243e2885d99d5b84b0f771d347acd571c12b4c68d51d72d500cb64f50351e289358926cd22d4e66a2d059090ea96d99973ace8cc2b
-MISC ChangeLog 3182 SHA256 7dbf267e557876f13799365d135318fb45984c3ab627dfbc0b43667e592a369d SHA512 de6fb8be1f30962f49640e8f476507fd03ebec12fee75653961a47ccfb7a4dfa919367631a00053f49b35aa1d1b70d253a818931188c4123269d1af570e30693 WHIRLPOOL 64a8e6e7c75a15907b98e7ff2efb0d91b5cf68e72cc07e0aec16f38f7cc3845d9b4e80f404de4b03795ec56322c8a56b6203ed3631d6198e3d33be0e166eb534
+EBUILD axtls-1.4.9.ebuild 4594 SHA256 d3fa02a4383d4104e2e61af38660f731b1ff3847df161f8f541476711177a6f6 SHA512 ef2f0fbc2d2336cd0f9ce729e9d1735ae3c1cd9832042ab9c315a14e6cbed074cb791142b31c426465ab842f0e57d933f66101d6a1f5dd79b6ed0b7b187f7952 WHIRLPOOL 3aacb634eb0c5e24dd126926a18916ed5c3bcff7766aeec7796a2010bdeafe04bf9d5e1600825bd710f7f602620a5e88c9fca428a860d1ec3be2e864517ed598
+MISC ChangeLog 3374 SHA256 13b1bc50fce623beaf1aa0141ea50de3933c5a1facabab4a89023f0c21064c04 SHA512 f1e8bec3f471da81e8179c7c40624674e04e770018869ac6bd31c42318e701b0e3a85b6fb78017e0a524cd9f3e6c08bde2b755485492c40cb4543ff56655ab3e WHIRLPOOL 33adb9c2675d21d794c7075ce720784742a7543848106122db8a44247dfe13f3daefda37d37e6fbe91c633a5ca07f412d68a7d270f4a63b7a56813a4e327d8a1
 MISC metadata.xml 539 SHA256 678ce846bdfbf9df350ed0ba25520abe1588a12c229cbc54642269cf2fbe0966 SHA512 66019369788d013f2b9f541affea0e528ff544606ed19b5faaa1ca8c9681c05321ca0505ad98f120490a500cf9fb9bd5d659958d3666b766c74edb242c3913cf WHIRLPOOL a5a2f029e4b06b6f3dd7313182da640ae698ad5de07a4a4a4175b07966b67150cca8f98591b000c51b97596f99a4761f7969322a97c127305b73423726461a4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBew84ACgkQuUQtlDBCeQK2ogCfbTeXiHbd8CT75kSgB2qfW79C
-KXEAn3ea7dkY8+erTQtzoHohpFm2q4iz
-=J85B
+iQIcBAEBCAAGBQJQ6hBMAAoJEJOE+m71LUu6BeYP/1PsP5T6PMjFmWkytpoIsw9E
+h9s7eq04YfFWEEckhsMAZsp3hIGxQRim73jmaEZLxVn510njSbQSfMIlCew020dG
+EgsvbM0OqMibzoFRRKrZ0Z1+MtTJYVrL05it+h4rFEaw8aDHcTxo374+3W9jDpIL
+0p5STbRf4IME2LO8c+MokhU2PG9d0bXA36xCR6ODY81BO5KAHb6yCYK87E9qp2ZG
+f79xny5yiEcUUsQkB9711/E/31tkgYK5/xPckgvmJzl/X4fgTrZQmKk5ibsYUdzY
+kYgkznlEpPhOrYw1xY5/4UZxykgtzKwtuifALSiTYM+oWA6NrKf0nGQ+3qnblfkM
+pdKHg3H7+PE22Kf+S+dyf6EFX4xr2VX6L1lWfEJqlJhSw+cKOMvT6KAJ0ylzcdkq
+q8Ta3FNfhOr0q9aMzIhmGubBMx2Vn0f5rE9w4RNyLyC4iNJoXJbtw2IpS9kcWVrD
+8ugja+4v13/26JU/+pltB1oNw2xdsSlBxtitSuuEDKywDBuI8i7N5e88v0Ld6pat
+NBRuBpR4ix2g9pS4MsFNYDDz7twe8367jlW3WPRCCK6r/kWYR0L2awyrzzrW0YB8
+yYS+CmM2lnUPrAxUDHfUVAEvs+a+9573l57RdOICJ0jHM3db+BA6U7Xr+rAmR+iq
+WUU/lRjdpLWwh/Rhh16l
+=Z7XP
 -----END PGP SIGNATURE-----
diff --git a/net-libs/axtls/axtls-1.4.9.ebuild b/net-libs/axtls/axtls-1.4.9.ebuild
new file mode 100644
index 000000000000..c36e884f3115
--- /dev/null
+++ b/net-libs/axtls/axtls-1.4.9.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/axtls-1.4.9.ebuild,v 1.1 2013/01/07 00:01:07 blueness Exp $
+
+EAPI="4"
+
+inherit eutils multilib 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 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+
+IUSE="httpd cgi-lua cgi-php static static-libs 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}/explicit-libdir.patch"
+
+	sed -i -e 's:^LIBDIR.*/lib:LIBDIR = $(PREFIX)/'"$(get_libdir):" \
+		"${S}"/Makefile
+
+	#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 ! use static-libs; then
+		rm -f "${ED}"/usr/$(get_libdir)/libaxtls.a
+	fi
+
+	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
+}