strndup workaround for gfbsd, #227799

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r6 x86_64

4 files changed, 46 insertions, 5 deletions

diff --git a/mail-mta/ssmtp/ChangeLog b/mail-mta/ssmtp/ChangeLog
index f09ed2dbb31e..e282cd63db33 100644
--- a/mail-mta/ssmtp/ChangeLog
+++ b/mail-mta/ssmtp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/ssmtp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.50 2008/06/11 18:00:53 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ChangeLog,v 1.51 2008/07/11 18:56:48 dertobi123 Exp $
+
+  11 Jul 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  +files/ssmtp-2.62-strndup.patch, ssmtp-2.62.ebuild:
+  strndup workaround for gfbsd, #227799
 
   11 Jun 2008; Tobias Scherbaum <dertobi123@gentoo.org> ssmtp-2.62.ebuild:
   Fix virtual/mta blocker
diff --git a/mail-mta/ssmtp/Manifest b/mail-mta/ssmtp/Manifest
index e28abdd1d309..8f4a1b0d509e 100644
--- a/mail-mta/ssmtp/Manifest
+++ b/mail-mta/ssmtp/Manifest
@@ -2,11 +2,12 @@ AUX mailer.conf 349 RMD160 1cad356faa6ee30e7bed9d70754487cac8f088e5 SHA1 4ab7aee
 AUX ssmtp-2.60.4-md5.patch 1509 RMD160 caa14a0e51aa19eac8611d1b92f9dce1f75180ce SHA1 4d1d2ca539da6f563fc7546179317658d04659b2 SHA256 0d229305afae580867470dc189b5fa25dc9aa18d7f4573471ada38ea4f47503a
 AUX ssmtp-2.60.7-logfile.patch 1256 RMD160 8bc7ddeedd448dff20ba2df52b8cdb2157e25aaa SHA1 16916f64915646c36aaecc7a0b1ff20b666edafb SHA256 244f021698493f1e87180a6200d39d0c963ad1392e489ab183e9f5264ca574b1
 AUX ssmtp-2.61-bug127592.patch 385 RMD160 61f877e742bbf23e13056884bccae5a22a17fe75 SHA1 27a4aafc3cbffd11c6427e5ac02c3484396091ef SHA256 256a783b5e73b9914cb49854b367ce9f5781d8664cd640e6b0b9d0b5f6948edc
+AUX ssmtp-2.62-strndup.patch 682 RMD160 d56434a83ec6bb49cafb67846e0082551d1a3be3 SHA1 9b8328c8ea1410683dd13cc770582658e33d716e SHA256 2ce7b4526db527656bfb9cde41f940e5da23b9fb2089a6b5b9bd4bae6dfa07ab
 DIST ssmtp_2.61.orig.tar.gz 53341 RMD160 da76ee6dd86fc663e6fd69fcb2fb5f550f716de7 SHA1 bc4b6c20bf8c2c9e66b359e3c24545a2615a1988 SHA256 2151ad18cb73f9a254f796dde2b48be7318b45410b59fedbb258db5a41044fb5
 DIST ssmtp_2.62.orig.tar.gz 57127 RMD160 1c16b2d50224f4d29813a34f87a3480e66892b36 SHA1 5c15aafb252f6cb11e4b93140a1457b6cb0d0fb8 SHA256 e2a0a5379cd0bbb0b4b0304abeba7a8f60aa85275982c5d7930c319e7f284ed1
 EBUILD ssmtp-2.61-r2.ebuild 3427 RMD160 a675e5b8374d158cea313535386fb4d4e82169b6 SHA1 d833114b89c59bd48c44bef8e192f1f6b2759519 SHA256 1e00a67f270d423f140dac1a49c6e02af4acce82130825f854c6632bbec2348b
 EBUILD ssmtp-2.61-r30.ebuild 1865 RMD160 acd00d9eeab71238158e9530bddac6d8183b9000 SHA1 6e0757320544ec047615491cfd152f0dfa936191 SHA256 82eb4aea32ff188f9b67c98074355aea535ff9837c1e4f63e742b07df430a70d
 EBUILD ssmtp-2.61-r31.ebuild 2062 RMD160 9c13f57dd10b412040f84cbf3fa67bc87df7f9a9 SHA1 05385ffc6e32ba8338e9de7d29652ae8e9f037f3 SHA256 044b118c7bb1dd9328adf58ee01e1d6edd62411289b54018e2919254975fa657
-EBUILD ssmtp-2.62.ebuild 2412 RMD160 24e202d698f6d6bd5382e940b3e379489faa2363 SHA1 53e4197fed3ce164c9b29f7ef654610191f60e65 SHA256 f97892513122c6854212ee748d5b08ba78c48a5d54745c9c33c53803e3520f96
-MISC ChangeLog 11530 RMD160 9acbb51223036899ea76eebe0489ae2410875193 SHA1 59eaba84c138d0a3f71079d4b5a218927ba5e28e SHA256 a9ce6fb6c3ee8e522bf98c831d614dea875b9f72c1d57821b141a34cc1b17203
+EBUILD ssmtp-2.62.ebuild 2502 RMD160 dbf48882abc3ec6a4fcd0ae867610900898cc010 SHA1 f3164390d8c7feee8caa251402a0f6d75d223882 SHA256 bcd5d3e91e6f320bf3876692962cd2f4ffb0a21862d5a73a808e4754e934b6ed
+MISC ChangeLog 11681 RMD160 796b80b83d1c1af0ebda60aca1f5840f5df5e7cf SHA1 1eaa2556a3189de1e23f632310ad451a69c9e6bd SHA256 f97094323d1cdd7b4f543df5f9e45fff75a8ae2c1b8f868e37daf68f7cc321d8
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
diff --git a/mail-mta/ssmtp/files/ssmtp-2.62-strndup.patch b/mail-mta/ssmtp/files/ssmtp-2.62-strndup.patch
new file mode 100644
index 000000000000..a4434ebf08bb
--- /dev/null
+++ b/mail-mta/ssmtp/files/ssmtp-2.62-strndup.patch
@@ -0,0 +1,32 @@
+Compensate for platforms that don't have strndup, like Solaris
+
+--- configure.in
++++ configure.in
+@@ -30,7 +30,7 @@
+ dnl Checks for library functions.
+ AC_TYPE_SIGNAL
+ AC_FUNC_VPRINTF
+-AC_CHECK_FUNCS(gethostname socket strdup strstr)
++AC_CHECK_FUNCS(gethostname socket strdup strndup strstr)
+ 
+ dnl Check for optional features
+ AC_ARG_ENABLE(logfile, 
+--- ssmtp.c
++++ ssmtp.c
+@@ -842,7 +842,16 @@
+ 	if (!rest) {
+ 		return NULL;
+ 	}
++#ifdef HAVE_STRNDUP
+ 	tok=strndup(*s,rest-(*s));
++#else
++	{
++		size_t len = rest - (*s);
++		tok = malloc(sizeof(char) * (len + 1));
++		memcpy(tok, *s, len);
++		tok[len] = '\0';
++	}
++#endif
+ 	if (!tok) {
+ 		die("firsttok() -- strndup() failed");
+ 	}
diff --git a/mail-mta/ssmtp/ssmtp-2.62.ebuild b/mail-mta/ssmtp/ssmtp-2.62.ebuild
index 878182af966e..0ead83f2a1ca 100644
--- a/mail-mta/ssmtp/ssmtp-2.62.ebuild
+++ b/mail-mta/ssmtp/ssmtp-2.62.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.62.ebuild,v 1.4 2008/06/11 18:00:53 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/ssmtp/ssmtp-2.62.ebuild,v 1.5 2008/07/11 18:56:48 dertobi123 Exp $
 
 inherit eutils toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/s/ssmtp/${P/-/_}.orig.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="ssl ipv6 md5sum"
+IUSE="ssl ipv6 md5sum elibc_FreeBSD"
 
 DEPEND="ssl? ( dev-libs/openssl )"
 RDEPEND="${DEPEND}
@@ -29,6 +29,10 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
+	if use elibc_FreeBSD ; then
+		epatch "${FILESDIR}/${P}-strndup.patch"
+	fi
+
 	# Respect LDFLAGS (bug #152197)
 	sed -i -e 's:$(CC) -o:$(CC) @LDFLAGS@ -o:' Makefile.in
 }