revbump; patch to fix deficit in qmail eclass wrt Bugs #516868 #546992

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

3 files changed, 75 insertions, 2 deletions

diff --git a/sys-apps/ucspi-ssl/ChangeLog b/sys-apps/ucspi-ssl/ChangeLog
index cc54a79eba28..7fed23227aca 100644
--- a/sys-apps/ucspi-ssl/ChangeLog
+++ b/sys-apps/ucspi-ssl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/ucspi-ssl
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-ssl/ChangeLog,v 1.36 2015/04/14 12:32:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-ssl/ChangeLog,v 1.37 2015/04/19 04:39:44 idella4 Exp $
+
+*ucspi-ssl-0.94-r1 (19 Apr 2015)
+
+  19 Apr 2015; Ian Delaney <idella4@gentoo.org> +ucspi-ssl-0.94-r1.ebuild,
+  +files/ucspi-ssl-0.94-verbose.patch:
+  revbump; patch to fix deficit in qmail eclass wrt Bugs #516868 #546992
 
   14 Apr 2015; Agostino Sarubbo <ago@gentoo.org> ucspi-ssl-0.94.ebuild:
   Stable for ia64, wrt bug #516868
@@ -28,7 +34,7 @@
 *ucspi-ssl-0.94 (03 Apr 2015)
 
   03 Apr 2015; Ian Delaney <idella4@gentoo.org> +ucspi-ssl-0.94.ebuild:
-  bump; ebuild preapred by Alex Efrox in Bug #516868
+  bump; ebuild preapred by Alex Efros in Bug #516868
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> ucspi-ssl-0.70-r1.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/sys-apps/ucspi-ssl/files/ucspi-ssl-0.94-verbose.patch b/sys-apps/ucspi-ssl/files/ucspi-ssl-0.94-verbose.patch
new file mode 100644
index 000000000000..680c7b58b8fe
--- /dev/null
+++ b/sys-apps/ucspi-ssl/files/ucspi-ssl-0.94-verbose.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/show_bug.cgi?id=546992#c10
+--- a/print-cc.sh
++++ b/print-cc.sh
+@@ -45,4 +45,5 @@ case "$cc:$systype" in
+ esac
+ 
+ cat warn-auto.sh
++echo echo "$cc" "$gccssl" '-c ${1+"$@"}'
+ echo exec "$cc" "$gccssl" '-c ${1+"$@"}'
+--- a/print-ld.sh
++++ b/print-ld.sh
+@@ -3,4 +3,5 @@ systype="`cat systype`"
+ 
+ cat warn-auto.sh
+ echo 'main="$1"; shift'
++echo echo "$ld" '-o "$main" "$main".o ${1+"$@"}'
+ echo exec "$ld" '-o "$main" "$main".o ${1+"$@"}'
+
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
new file mode 100644
index 000000000000..5940f1f86fd0
--- /dev/null
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild,v 1.1 2015/04/19 04:39:44 idella4 Exp $
+
+EAPI=5
+
+inherit eutils fixheadtails qmail
+
+DESCRIPTION="Command-line tools for building SSL client-server applications"
+HOMEPAGE="http://www.fehcom.de/ipnet/ucspi-ssl.html"
+SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="perl"
+
+DEPEND=">=dev-libs/openssl-0.9.6g:="
+RDEPEND="${DEPEND}
+	sys-apps/ucspi-tcp"
+
+S="${WORKDIR}"/host/superscript.com/net/${P}/src
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-verbose.patch"
+
+	ht_fix_all
+	sed -i -e 's:HOME/command:/usr/bin:' sslcat.sh sslconnect.sh https\@.sh
+	sed -i -e 's:auto:gcc:' conf-cc conf-ld
+
+	qmail_set_cc
+
+	echo "/usr/bin" > conf-tcpbin
+	echo "/usr/" > home
+	echo "/usr/share/ca-certificates/" > conf-cadir
+	echo "${QMAIL_HOME}/control/dh1024.pem" > conf-dhfile
+}
+
+src_compile() {
+	# build fails without setting to j1
+	emake -j1
+}
+
+src_install() {
+	dodoc ../doc/*
+	doman ../man/*.*
+	dobin sslserver sslclient sslcat sslconnect https\@ || die
+	use perl && dobin sslperl
+}