[gentoo-commits] proj/hardened-dev:uclibc commit in: dev-libs/nettle/, dev-libs/nettle/files/

[Anthony G. Basile]

commit:     58b01d175d8b6d53450edc000125f84dac96fd5f
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat May 12 05:14:56 2012 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat May 12 05:14:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=58b01d17

dev-libs/nettle: fixes bug #415193

---
 .../nettle/files/nettle-2.4-darwin-shlink.patch    |   53 ++++++++++++++++++++
 dev-libs/nettle/files/nettle-2.4-link-lm.patch     |   12 +++++
 dev-libs/nettle/metadata.xml                       |    5 ++
 dev-libs/nettle/nettle-2.4-r99.ebuild              |   35 +++++++++++++
 4 files changed, 105 insertions(+), 0 deletions(-)

diff --git a/dev-libs/nettle/files/nettle-2.4-darwin-shlink.patch b/dev-libs/nettle/files/nettle-2.4-darwin-shlink.patch
new file mode 100644
index 0000000..da32808
--- /dev/null
+++ b/dev-libs/nettle/files/nettle-2.4-darwin-shlink.patch
@@ -0,0 +1,53 @@
+From MacPorts:
+https://trac.macports.org/browser/trunk/dports/devel/nettle/files/patch-configure.diff
+
+nettle: move -L. before $(LDFLAGS) (which will contain -L${prefix}/lib)
+so future updates when the new and old libraries are incompatible don't
+go awry
+
+Reworked by Gentoo for configure.ac
+
+Fixes in particular the linking stage on Darwin, using the right
+dependency libs, and creating the right names.
+
+Fixed incorrect -gmp argument in LIBS (probably typo)
+
+
+--- configure.ac
++++ configure.ac
+@@ -61,9 +61,7 @@
+   [enable_gcov=no])
+ 
+ LSH_RPATH_INIT([`echo $with_lib_path | sed 's/:/ /g'` \
+-    `echo $exec_prefix | sed "s@^NONE@$prefix/lib@g" | sed "s@^NONE@$ac_default_prefix/lib@g"` \
+-    /usr/local/lib /sw/local/lib /sw/lib \
+-    /usr/gnu/lib /opt/gnu/lib /sw/gnu/lib /usr/freeware/lib /usr/pkg/lib])
++    `echo $exec_prefix | sed "s@^NONE@$prefix/lib@g" | sed "s@^NONE@$ac_default_prefix/lib@g"`])
+ 
+ # Checks for programs.
+ AC_PROG_CC
+@@ -281,16 +280,16 @@
+     ;;
+   darwin*)
+     LIBNETTLE_FORLINK=libnettle.dylib
+-    LIBNETTLE_SONAME='$(LIBNETTLE_FORLINK).$(LIBNETTLE_MAJOR)'
+-    LIBNETTLE_FILE='$(LIBNETTLE_SONAME).$(LIBNETTLE_MINOR)'
+-    LIBNETTLE_LINK='$(CC) -dynamiclib $(LDFLAGS)'
+-    LIBNETTLE_LIBS=''
++    LIBNETTLE_SONAME='libnettle.$(LIBNETTLE_MAJOR).dylib'
++    LIBNETTLE_FILE='libnettle.$(LIBNETTLE_MAJOR).$(LIBNETTLE_MINOR).dylib'
++    LIBNETTLE_LINK='$(CC) -dynamiclib $(LDFLAGS) -install_name ${libdir}/$(LIBNETTLE_SONAME) -compatibility_version $(LIBNETTLE_MAJOR) -current_version $(LIBNETTLE_MAJOR).$(LIBNETTLE_MINOR)'
++    LIBNETTLE_LIBS='$(LIBS)'
+ 
+     LIBHOGWEED_FORLINK=libhogweed.dylib
+-    LIBHOGWEED_SONAME='$(LIBHOGWEED_FORLINK).$(LIBHOGWEED_MAJOR)'
+-    LIBHOGWEED_FILE='$(LIBHOGWEED_SONAME).$(LIBHOGWEED_MINOR)'
+-    LIBHOGWEED_LINK='$(CC) -dynamiclib $(LDFLAGS)'
+-    LIBHOGWEED_LIBS=''
++    LIBHOGWEED_SONAME='libhogweed.$(LIBHOGWEED_MAJOR).dylib'
++    LIBHOGWEED_FILE='libhogweed.$(LIBHOGWEED_MAJOR).$(LIBHOGWEED_MINOR).dylib'
++    LIBHOGWEED_LINK='$(CC) -dynamiclib -L. $(LDFLAGS) -install_name ${libdir}/$(LIBHOGWEED_SONAME) -compatibility_version $(LIBHOGWEED_MAJOR) -current_version $(LIBHOGWEED_MAJOR).$(LIBHOGWEED_MINOR)'
++    LIBHOGWEED_LIBS='$(LIBS) -lnettle'
+     ;;
+   solaris*)
+     # Sun's ld uses -h to set the soname, and this option is passed

diff --git a/dev-libs/nettle/files/nettle-2.4-link-lm.patch b/dev-libs/nettle/files/nettle-2.4-link-lm.patch
new file mode 100644
index 0000000..3127ad0
--- /dev/null
+++ b/dev-libs/nettle/files/nettle-2.4-link-lm.patch
@@ -0,0 +1,12 @@
+diff -Naur nettle-2.4.orig//examples/Makefile.in nettle-2.4/examples/Makefile.in
+--- nettle-2.4.orig//examples/Makefile.in	2011-09-03 12:51:07.000000000 +0000
++++ nettle-2.4/examples/Makefile.in	2012-05-08 23:49:01.580003605 +0000
+@@ -68,7 +68,7 @@
+ 
+ nettle-benchmark$(EXEEXT): nettle-benchmark.$(OBJEXT) nettle-openssl.$(OBJEXT) $(GETOPT_OBJS)
+ 	$(LINK) nettle-benchmark.$(OBJEXT) nettle-openssl.$(OBJEXT) io.$(OBJEXT) $(GETOPT_OBJS) \
+-	-lnettle $(BENCH_LIBS) $(OPENSSL_LIBFLAGS) -o nettle-benchmark$(EXEEXT)
++	-lnettle -lm $(BENCH_LIBS) $(OPENSSL_LIBFLAGS) -o nettle-benchmark$(EXEEXT)
+ 
+ $(TARGETS) : io.$(OBJEXT) ../libnettle.a
+ 

diff --git a/dev-libs/nettle/metadata.xml b/dev-libs/nettle/metadata.xml
new file mode 100644
index 0000000..d68fe97
--- /dev/null
+++ b/dev-libs/nettle/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>crypto</herd>
+</pkgmetadata>

diff --git a/dev-libs/nettle/nettle-2.4-r99.ebuild b/dev-libs/nettle/nettle-2.4-r99.ebuild
new file mode 100644
index 0000000..80cc67e
--- /dev/null
+++ b/dev-libs/nettle/nettle-2.4-r99.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nettle/nettle-2.4.ebuild,v 1.13 2012/04/26 15:39:22 aballier Exp $
+
+EAPI="4"
+
+inherit eutils autotools
+
+DESCRIPTION="Low-level cryptographic library"
+HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
+SRC_URI="http://www.lysator.liu.se/~nisse/archive/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-3 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+gmp ssl"
+
+DEPEND="gmp? ( dev-libs/gmp )
+	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	sed -e "/CFLAGS=/s: -ggdb3::" -i configure.ac || die "sed failed"
+	epatch "${FILESDIR}"/${P}-darwin-shlink.patch
+	epatch "${FILESDIR}"/${P}-link-lm.patch
+	sed -i -e 's/solaris\*)/sunldsolaris*)/' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable gmp public-key) \
+		$(use_enable ssl openssl)
+}