Fix building with newer gcc versions and cleanup implicit warnings that hate 64bit hosts.

Package-Manager: portage-2.1_pre6

4 files changed, 91 insertions, 14 deletions

diff --git a/net-mail/smtptools/ChangeLog b/net-mail/smtptools/ChangeLog
index de4da9b4de04..9ea7347ebdec 100644
--- a/net-mail/smtptools/ChangeLog
+++ b/net-mail/smtptools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/smtptools
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/smtptools/ChangeLog,v 1.2 2004/12/13 23:24:16 ticho Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/smtptools/ChangeLog,v 1.3 2006/03/12 09:43:58 vapier Exp $
+
+  12 Mar 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/smtptools-0.2.3-cleanups.patch, smtptools-0.2.3.ebuild:
+  Fix building with newer gcc versions and cleanup implicit warnings that hate
+  64bit hosts.
 
   14 Dec 2004; Andrej Kacian <ticho@gentoo.org> smtptools-0.2.3.ebuild:
   Stable on x86.
diff --git a/net-mail/smtptools/Manifest b/net-mail/smtptools/Manifest
index e47a20cad58c..bf3652803359 100644
--- a/net-mail/smtptools/Manifest
+++ b/net-mail/smtptools/Manifest
@@ -1,22 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d700f490627e992861947c08896ec0fa ChangeLog 516
-RMD160 19fbf7c83dffe0742d5630f299bc8bc96257262c ChangeLog 516
-SHA256 17d7618e46b3f61f3450653c54b856a449592cdb9175a8139b52666ba133b97b ChangeLog 516
+MD5 69edcd96d350829344b0cee517a400fc ChangeLog 727
+RMD160 8054855287ad19315a4561d492bb1bf868a95a26 ChangeLog 727
+SHA256 6e6a4b6720815689472a7c879dcac5a37166ddc2003f92d63f91cd9037d6b348 ChangeLog 727
 MD5 b9039ecb54e23c7820331c02902fa2a0 files/digest-smtptools-0.2.3 67
 RMD160 6bb33b90af6e49e8cfd314ee572f1b7bf0ff3a79 files/digest-smtptools-0.2.3 67
 SHA256 6692de67469036891f009bdba336651ec5d6a1d064f81a516ef774de18b5280f files/digest-smtptools-0.2.3 67
+MD5 00faf05c77547f1edfa1bde840754cad files/smtptools-0.2.3-cleanups.patch 1878
+RMD160 d2bf184b98010c53be2dc9987fc3afb9e3e185ca files/smtptools-0.2.3-cleanups.patch 1878
+SHA256 2208c60ca082ca2ac84bff751ce82c58302b2ac931db0072b63c582068aafe2b files/smtptools-0.2.3-cleanups.patch 1878
 MD5 76d3681a949c983c4790bcd7e89d77bc metadata.xml 254
 RMD160 86528bcbd49f8acd5b836ca2a21e268878473345 metadata.xml 254
 SHA256 edb0d38cd8c18831d88ecf51d0f36b155527bef06b1e0b0dc290d3bdcf8f0547 metadata.xml 254
-MD5 841e3365bbdeaff022cfae753fee8843 smtptools-0.2.3.ebuild 1001
-RMD160 2fcb26d0933d2c2f917b964cfbb2af9c39f77ed8 smtptools-0.2.3.ebuild 1001
-SHA256 4c1b7170299f9247b7bd45a644c351fa0a07a93b94acc0ae2da5646007067ac9 smtptools-0.2.3.ebuild 1001
+MD5 5c2fb05f922d812e7430db3dc02a07f2 smtptools-0.2.3.ebuild 1118
+RMD160 66cd4a6375a8a98d5ba7bfb10b0255c4ab887c33 smtptools-0.2.3.ebuild 1118
+SHA256 bbb9efb4e37f5600c54c64f26259026b0e2f37c5e4e5208989b1474ca24de881 smtptools-0.2.3.ebuild 1118
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFD4pEq2+ySkm8kpY0RAm9jAKCmul7d2vzkQXvoqWMW4vcxf6N+dACaA8xx
-951yvbGiIAGCRKf2NOrFnac=
-=TrEq
+iD8DBQFEE+3P2+ySkm8kpY0RAketAKC3XYaGRzDa0TDfO8nkIhC8MAUCsACfczKb
+qGVVnWZnpC6uZWAT7q1Gvh0=
+=r9yX
 -----END PGP SIGNATURE-----
diff --git a/net-mail/smtptools/files/smtptools-0.2.3-cleanups.patch b/net-mail/smtptools/files/smtptools-0.2.3-cleanups.patch
new file mode 100644
index 000000000000..6873cf390255
--- /dev/null
+++ b/net-mail/smtptools/files/smtptools-0.2.3-cleanups.patch
@@ -0,0 +1,61 @@
+--- smtptools/usmtpd.c
++++ smtptools/usmtpd.c
+@@ -60,8 +60,8 @@
+ /* run */ static const char *reminfo;
+ /* run */ static const char *relayclient;
+ 
+-/* opt */ static unsigned long read_timeout=1200;
+-/* opt */ static unsigned long write_timeout=1200;
++/* opt */ static unsigned long u_read_timeout=1200;
++/* opt */ static unsigned long u_write_timeout=1200;
+ /* opt */ static char *log_spec_str=NULL;
+ /* opt */ static unsigned long aging=0;
+ 
+@@ -108,7 +108,7 @@
+ 			"Use $QMAILQUEUE to override, overrides --maildir\n", "PATH"},
+ 	{'r',"relaydb", UOGO_STRING,&relaydbname,1, 
+ 			"Path to relaying control file", "FILE"},
+-    {'R',"read-timeout", UOGO_ULONG,&read_timeout,0, 
++    {'R',"read-timeout", UOGO_ULONG,&u_read_timeout,0, 
+ 			"Timeout in seconds for reading from remote", "TIMEOUT"},
+     {'s',"max-size", UOGO_ULONG,&maxsize,0,
+ 			"Maximum size of messages\noverridden by $DATABYTES", "LIMIT"},
+@@ -117,7 +117,7 @@
+ 			"Used for DNS and envelope sender checking.\n"
+ 			"Default: accept messages during this time"},
+ 		   /*123456789012345678901234567890123456789012345678901234567890*/
+-    {'W',"write-timeout", UOGO_ULONG,&write_timeout,0, 
++    {'W',"write-timeout", UOGO_ULONG,&u_write_timeout,0, 
+ 			"Timeout in seconds for writing to remote.","TIMEOUT"},
+ 	{0,0}
+ };
+@@ -632,9 +632,9 @@
+ 	}
+ 
+ 	uoio_assign_r(&i,0,read,0);
+-	i.timeout=read_timeout;
++	i.timeout=u_read_timeout;
+ 	uoio_assign_w(&o,1,write,0);
+-	o.timeout=write_timeout;
++	o.timeout=u_write_timeout;
+ 
+ 	if (rblcheck) do_rbl_check(&o);
+ 
+--- smtptools/relaydb.c
++++ smtptools/relaydb.c
+@@ -1,4 +1,5 @@
+ #include "config.h"
++#include <string.h>
+ #include <unistd.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+--- smtptools/uostr.h
++++ smtptools/uostr.h
+@@ -1,6 +1,7 @@
+ #ifndef UOSTR_H
+ #define UOSTR_H
+ 
++#include <string.h>
+ #include "uocompiler.h" /* P__ */
+ #include "attribs.h"
+ 
diff --git a/net-mail/smtptools/smtptools-0.2.3.ebuild b/net-mail/smtptools/smtptools-0.2.3.ebuild
index 9163d45620eb..760e00af4902 100644
--- a/net-mail/smtptools/smtptools-0.2.3.ebuild
+++ b/net-mail/smtptools/smtptools-0.2.3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/smtptools/smtptools-0.2.3.ebuild,v 1.9 2006/02/02 23:08:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/smtptools/smtptools-0.2.3.ebuild,v 1.10 2006/03/12 09:43:58 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="A collection of tools to send or receive mails with SMTP"
 HOMEPAGE="http://www.ohse.de/uwe/software/${PN}.html"
@@ -8,11 +10,17 @@ SRC_URI="ftp://ftp.ohse.de/uwe/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm m68k mips ppc ppc64 s390 sh x86"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh x86"
 IUSE=""
 
 DEPEND=""
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-cleanups.patch
+}
+
 src_compile() {
 	# the configure check looks for the symbol name 'dn_expand' in 
 	# libresolv but later glibc's use the internal symbol name