commit: 73d1fc607c8a00676d5d574abfa62300d43599be
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 9 16:26:54 2017 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Mon Jan 9 16:33:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73d1fc60
net-libs/gnutls: version bump
Package-Manager: portage-2.3.0
net-libs/gnutls/Manifest | 4 +-
.../{gnutls-3.4.17.ebuild => gnutls-3.3.26.ebuild} | 86 +++++++++++++++-------
.../{gnutls-3.5.7.ebuild => gnutls-3.5.8.ebuild} | 6 +-
3 files changed, 64 insertions(+), 32 deletions(-)
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 610cce3..48d11d8 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,4 +1,4 @@
DIST gnutls-3.3.24.tar.xz 6294532 SHA256
5b65fe2a91c8dfa32bedc78acffcb152e5426cd3349e2afc43cccc9bdaf18aa5 SHA512
1fbb2e15ade14db15d7acc9ff559ecfc39517fd99e6c784583a7a4f8786daf8053f35f41e39cde0eeb5a1dfd3193ad908b52f62f945fbd43c147dc87e55f192f
WHIRLPOOL
0725b35af9bbb4a7ee8f430af95e078066fb455328dd0ee71cca6633d093fe0433c7d869ebf0fabf8983679a32ff8451a2b631aec672810eb7bc55a3de28cc7d
DIST gnutls-3.3.25.tar.xz 6315372 SHA256
189d6c4e43465d2ec84f2cd66f0ef63657225926f56875e182743cfeef9f1f2e SHA512
6f9074f58250517287d183faac27afcc4318293b24b587b00494d40b6b5dae088fef993b5c2adf6842238adc1f694a747262b50bc602037626579b84401207f6
WHIRLPOOL
3d320378cd8e7330e2b399876bb8739dd35fe2dc1204b0ead561f214676583f2b2c1fa4c5a61b720e3af5c72769e804d9bc36f69f8659eb7a1d6e8a1a7012e2c
-DIST gnutls-3.4.17.tar.xz 6709492 SHA256
9b50e8a670d5e950425d96935c7ddd415eb6f8079615a36df425f09a3143172e SHA512
a0a578034e8092dd422dc310a655fda3c4a2de5cb06745d9b47bb39734cb983902553b56dfbbabc618b3824defc62489b1b3c8de3b824b97b28273ddedd06ea7
WHIRLPOOL
6352f3caad1b8f93fa57a16a3187a6aca4df761bd4409e6f704f13ea22a53aa3bce75190d5dba4d41c1be72b5a5ee794c32c4d30fb4761f22e0f2a97d8507bb2
-DIST gnutls-3.5.7.tar.xz 7265264 SHA256
60cbfc119e6268cfa38d712621daa473298a0c5b129c0842caec4c1ed4d7861a SHA512
0854ed307c428f9881ea9764086c08efc64277a268ddcfb00ea4e86511c14ce0325e235db1f39f1cf3993faa972e2322ae2b162cec707728959a6b8dc4a235e1
WHIRLPOOL
4c1fb572c6943080bba654da10b4dc29b8e95b2b6e3ef59db2de8f9aa0767696b2399c64b8ff158966b02e76abe16d5835fdafc83079adf4cedb85b23997f1bf
+DIST gnutls-3.3.26.tar.xz 6361068 SHA256
6a7d882b6b581d684883fde195abf930dab37dfbe6aaea88ab164252bec720d9 SHA512
41259f760f5ed9b87d4203de567efb1a2087e01a025f2ea0f14167f146ecd640fbddeab390fbae6acc262507229894774db883d0892d448068ee73abb110738f
WHIRLPOOL
afca5aabebf36064847933662736c7713b837375db2c91c416d43a980407d912edf8fb64f53615c0bed770f46a9d2e0a3eb309f6a66281f5377e50a02863c8e7
+DIST gnutls-3.5.8.tar.xz 7264448 SHA256
0e97f243ae72b70307d684b84c7fe679385aa7a7a0e37e5be810193dcc17d4ff SHA512
e6cdc4f9f2e41bd10e61b90b6b5ea3882c80a7130de8a0e9c23e373985cdc332128529dad49d6854fe93ee934e1bbde8b34dfd19e354b3a8e11b22d61424292e
WHIRLPOOL
8e9c0407d13793b1c2a8a6377588e87502fa0a9dc79fe8b963ceac558538326052620e95772d8cef61d2d4e680bcabd3094adf5cea09cff42dd272d4478e7f7c
diff --git a/net-libs/gnutls/gnutls-3.4.17.ebuild
b/net-libs/gnutls/gnutls-3.3.26.ebuild
similarity index 66%
rename from net-libs/gnutls/gnutls-3.4.17.ebuild
rename to net-libs/gnutls/gnutls-3.3.26.ebuild
index 275a56e..f8c59ad 100644
--- a/net-libs/gnutls/gnutls-3.4.17.ebuild
+++ b/net-libs/gnutls/gnutls-3.3.26.ebuild
@@ -10,37 +10,27 @@ DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the
GNU project"
HOMEPAGE="http://www.gnutls.org/";
SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0/30" # libgnutls.so number
+# LGPL-3 for libgnutls library and GPL-3 for libgnutls-extra library.
+# soon to be relicensed as LGPL-2.1 unless heartbeat extension enabled.
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux
~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
~x86-solaris"
IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
-IUSE="+cxx +crywrap dane doc examples guile idn nls +openssl pkcs11
static-libs test test-full +tls-heartbeat tools valgrind zlib ${IUSE_LINGUAS//
/ linguas_}"
-
-REQUIRED_USE="
- test? ( tools )
- test-full? ( pkcs11 openssl tools zlib )"
+IUSE="+cxx +crywrap dane doc examples guile nls +openssl pkcs11 static-libs
test zlib ${IUSE_LINGUAS// / linguas_}"
+# heartbeat support is not disabled until re-licensing happens fullyf
# NOTICE: sys-devel/autogen is required at runtime as we
# use system libopts
RDEPEND=">=dev-libs/libtasn1-4.3:=[${MULTILIB_USEDEP}]
- >=dev-libs/nettle-3.1:=[gmp,${MULTILIB_USEDEP}]
+ >=dev-libs/nettle-2.7:=[gmp,${MULTILIB_USEDEP}]
>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}]
- tools? ( sys-devel/autogen )
+ sys-devel/autogen
crywrap? ( net-dns/libidn )
dane? ( >=net-dns/unbound-1.4.20[${MULTILIB_USEDEP}] )
guile? ( >=dev-scheme/guile-1.8:=[networking] )
nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )
- pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] )
+ pkcs11? ( >=app-crypt/p11-kit-0.20.7[${MULTILIB_USEDEP}] )
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- idn? ( net-dns/libidn[${MULTILIB_USEDEP}] )
- valgrind? ( dev-util/valgrind )
- test-full? (
- app-crypt/dieharder
- app-misc/datefudge
- dev-libs/softhsm:2
- net-dialup/ppp
- net-misc/socat
- )
abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20140508
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
@@ -58,7 +48,7 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog NEWS README THANKS doc/TODO )
PATCHES=(
-
"${FILESDIR}/${PN}-3.4.7-build-allow-installing-man-1-even-with-disable-doc.patch"
+
"${FILESDIR}/${PN}-3.3.19-build-allow-installing-man-1-even-with-disable-doc.patch"
)
pkg_setup() {
@@ -98,33 +88,79 @@ src_prepare() {
multilib_src_configure() {
LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
+ # remove magic of library detection
+ # bug#438222
+ libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' |
sed -e 's/^ *\([^ ]*\) .*/\1/g'))
+
# TPM needs to be tested before being enabled
# hardware-accell is disabled on OSX because the asm files force
# GNU-stack (as doesn't support that) and when that's removed ld
# complains about duplicate symbols
ECONF_SOURCE=${S} \
econf \
+ --disable-valgrind-tests \
--without-included-libtasn1 \
+ --enable-heartbeat-support \
$(use_enable cxx) \
$(use_enable dane libdane) \
$(multilib_native_enable manpages) \
- $(multilib_native_use_enable tools) \
$(multilib_native_use_enable doc) \
$(multilib_native_use_enable doc gtk-doc) \
$(multilib_native_use_enable guile) \
$(multilib_native_use_enable crywrap) \
- $(multilib_native_use_enable test tests) \
- $(multilib_native_use_enable valgrind valgrind-tests) \
$(use_enable nls) \
$(use_enable openssl openssl-compatibility) \
- $(use_enable tls-heartbeat heartbeat-support) \
$(use_enable static-libs static) \
$(use_with pkcs11 p11-kit) \
$(use_with zlib) \
- $(use_with idn) \
--without-tpm \
--with-unbound-root-key-file=/etc/dnssec/root-anchors.txt \
+ "${libconf[@]}" \
$([[ ${CHOST} == *-darwin* ]] && echo
--disable-hardware-acceleration)
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/doc/reference/html doc/reference/html || die
+ fi
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ default
+
+ # symlink certtool for use in other ABIs
+ if use test; then
+ ln -s "${BUILD_DIR}"/src "${T}"/native-tools || die
+ fi
+ else
+ emake -C gl
+ emake -C lib
+ emake -C extra
+ use dane && emake -C libdane
+ fi
+}
+
+multilib_src_test() {
+ if multilib_is_native_abi; then
+ # parallel testing often fails
+ emake -j1 check
+ else
+ # use native ABI tools
+ ln -s "${T}"/native-tools/{certtool,gnutls-{serv,cli}} \
+ "${BUILD_DIR}"/src/ || die
+
+ emake -C gl -j1 check
+ emake -C tests -j1 check
+ fi
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ emake DESTDIR="${D}" install
+ else
+ emake -C lib DESTDIR="${D}" install
+ emake -C extra DESTDIR="${D}" install
+ use dane && emake -C libdane DESTDIR="${D}" install
+ fi
}
multilib_src_install_all() {
diff --git a/net-libs/gnutls/gnutls-3.5.7.ebuild
b/net-libs/gnutls/gnutls-3.5.8.ebuild
similarity index 98%
rename from net-libs/gnutls/gnutls-3.5.7.ebuild
rename to net-libs/gnutls/gnutls-3.5.8.ebuild
index 39a1d49..2df7f3a 100644
--- a/net-libs/gnutls/gnutls-3.5.7.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.8.ebuild
@@ -18,7 +18,7 @@ IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11
sslv2 +sslv3 static-
REQUIRED_USE="
test? ( tools )
- test-full? ( pkcs11 openssl tools zlib )"
+ test-full? ( pkcs11 openssl idn tools zlib )"
# NOTICE: sys-devel/autogen is required at runtime as we
# use system libopts
@@ -55,10 +55,6 @@ DEPEND="${RDEPEND}
nls? ( sys-devel/gettext )
test? ( app-misc/datefudge )"
-PATCHES=(
- "${FILESDIR}/${P}-idn.patch"
-)
-
pkg_setup() {
# bug#520818
export TZ=UTC
