version bump

(Portage version: 2.1.10.49/cvs/Linux x86_64)

3 files changed, 118 insertions, 2 deletions

diff --git a/net-analyzer/postal/ChangeLog b/net-analyzer/postal/ChangeLog
index be21246b3663..e9a89fdf96e8 100644
--- a/net-analyzer/postal/ChangeLog
+++ b/net-analyzer/postal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/postal
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/postal/ChangeLog,v 1.8 2011/06/08 09:33:51 eras Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/postal/ChangeLog,v 1.9 2012/03/05 14:37:09 eras Exp $
+
+*postal-0.72 (05 Mar 2012)
+
+  05 Mar 2012; Eray Aslan <eras@gentoo.org> +postal-0.72.ebuild,
+  +files/02_postal-0.72-nossl.patch:
+  version bump
 
   08 Jun 2011; Eray Aslan <eras@gentoo.org> postal-0.70.ebuild,
   +files/06_postal-0.70-ldflags.patch:
diff --git a/net-analyzer/postal/files/02_postal-0.72-nossl.patch b/net-analyzer/postal/files/02_postal-0.72-nossl.patch
new file mode 100644
index 000000000000..238dbdbb783d
--- /dev/null
+++ b/net-analyzer/postal/files/02_postal-0.72-nossl.patch
@@ -0,0 +1,72 @@
+diff -NrU5 postal-0.69.orig/configure.in postal-0.69/configure.in
+--- configure.in	2008-04-09 03:08:28.000000000 +0200
++++ configure.in	2008-04-23 22:37:41.000000000 +0200
+@@ -13,15 +13,28 @@
+ else
+   stripping="-s"
+ fi
+ 
+ AC_ARG_ENABLE(openssl,
+-      [  --disable-openssl  disables openssl support],
+-      DISABLEOPENSSL=$opensslval, DISABLEOPENSSL=no)
++	[  --disable-openssl	disable openssl support],
++	[ if test $enableval = yes; then
++		DISABLEOPENSSL=no
++	else
++		DISABLEOPENSSL=yes
++	fi ]
++	,
++	[ DISABLEOPENSSL=no ])
++
+ AC_ARG_ENABLE(gnutls,
+-      [  --disable-gnutls  disables gnutls support],
+-      DISABLEGNUTLS=$gnutlsval, DISABLEGNUTLS=no)
++	[  --disable-gnutls  disables gnutls support],
++	[if test $enableval = yes; then
++		DISABLEGNUTLS=no
++	else
++		DISABLEGNUTLS=yes
++	fi]	
++	,
++	[ DISABLEGNUTLS=no ])
+ 
+ dnl Checks for programs.
+ AC_LANG_CPLUSPLUS
+ AC_PROG_CC
+ AC_PROG_CXX
+@@ -118,17 +131,17 @@
+ crypt_ldflags=
+ if [[ "$GNUTLS" = "no" ]]; then
+   gnutls=""
+ else
+   gnutls="#define USE_GNUTLS"
+-  crypt_ldflags="$extra_ldflags -lgnutls -lgcrypt"
++  crypt_ldflags=" -lgnutls -lgcrypt"
+ fi
+ if [[ "$OPENSSL" = "no" ]]; then
+   openssl=""
+ else
+   openssl="#define USE_OPENSSL"
+-  crypt_ldflags="$extra_ldflags -lssl -lcrypto"
++  crypt_ldflags=" -lssl -lcrypto"
+ fi
+ 
+ AC_SUBST(large_file)
+ large_file=""
+ 
+diff -NrU5 postal-0.69.orig/Makefile.in postal-0.69/Makefile.in
+--- Makefile.in	2008-04-10 03:19:34.000000000 +0200
++++ Makefile.in	2008-04-23 22:37:13.000000000 +0200
+@@ -16,11 +16,11 @@
+ INSTALL=@INSTALL@
+ 
+ TESTEXE=ex-test
+ BASEOBJS=userlist.o thread.o results.o address.o tcp.o cmd5.o mutex.o logit.o expand.o @extra_objs@
+ LFLAGS=-lstdc++ @extra_ldflags@
+-CRYPTLFLAGS=-lstdc++ @crypt_ldflags@
++CRYPTLFLAGS=-lstdc++ @extra_ldflags@  @crypt_ldflags@ 
+ 
+ 
+ ALLOBJS=$(BASEOBJS) smtp.o client.o basictcp.o bhmusers.o smtpserver.o
+ 
+ postal: postal.cpp $(BASEOBJS) postal.h smtp.o
diff --git a/net-analyzer/postal/postal-0.72.ebuild b/net-analyzer/postal/postal-0.72.ebuild
new file mode 100644
index 000000000000..542f94255fc3
--- /dev/null
+++ b/net-analyzer/postal/postal-0.72.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/postal/postal-0.72.ebuild,v 1.1 2012/03/05 14:37:09 eras Exp $
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="SMTP and POP mailserver benchmark. Supports SSL, randomized user accounts and more."
+HOMEPAGE="http://www.coker.com.au/postal/"
+SRC_URI="http://www.coker.com.au/postal/${P}.tgz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="ssl gnutls"
+#ssl is an alias for openssl. If both ssl and gnutls are enabled, automagic will
+#enable only gnutls.
+DEPEND="ssl? (
+	!gnutls? ( >=dev-libs/openssl-0.9.8g )
+	gnutls? ( >=net-libs/gnutls-2.2.2 )
+	)"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/01_${PN}-0.70-gcc43.patch"
+	epatch "${FILESDIR}/02_${PN}-0.72-nossl.patch"
+	epatch "${FILESDIR}/03_${PN}-0.70-c++0x-integrated.patch"
+	epatch "${FILESDIR}/04_${PN}-0.70-warnings.patch"
+	epatch "${FILESDIR}/05_${PN}-0.70-openssl-1.patch"
+	epatch "${FILESDIR}/06_${PN}-0.70-ldflags.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-stripping \
+		$(use_enable ssl openssl) \
+		$(use_enable gnutls)
+}