Fix build failure with newer glibcs #398109 by Markos Chandras.

Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64

4 files changed, 63 insertions, 13 deletions

diff --git a/mail-mta/mini-qmail/ChangeLog b/mail-mta/mini-qmail/ChangeLog
index fbe8acea842d..41ef7d535a99 100644
--- a/mail-mta/mini-qmail/ChangeLog
+++ b/mail-mta/mini-qmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/mini-qmail
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/mini-qmail/ChangeLog,v 1.15 2011/11/20 08:14:12 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/mini-qmail/ChangeLog,v 1.16 2012/01/08 03:39:59 vapier Exp $
+
+  08 Jan 2012; Mike Frysinger <vapier@gentoo.org> +files/1.06-headers.patch,
+  mini-qmail-1.06.ebuild:
+  Fix build failure with newer glibcs #398109 by Markos Chandras.
 
   20 Nov 2011; Mike Frysinger <vapier@gentoo.org> mini-qmail-1.06.ebuild:
   Block maildrop #374909 by Diego Elio Pettenò.
diff --git a/mail-mta/mini-qmail/Manifest b/mail-mta/mini-qmail/Manifest
index 13396596b493..4290cf32a1dd 100644
--- a/mail-mta/mini-qmail/Manifest
+++ b/mail-mta/mini-qmail/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX 1.05-config-mini-help.patch 672 RMD160 925566450e7926c4c9d79c355ec21e064591e15a SHA1 a70b56d54b102ab3f2cfaa08964d415605ecda05 SHA256 bc27d21c7994dda71f12658e8489de28673838b74f255d3475f55b99d069cfec
 AUX 1.06-exit.patch 551 RMD160 4e37d5e052d949ce682691141a835e209de302a5 SHA1 9de0b915ab9bda742aabece4288538e4ff6b00c9 SHA256 400ab4719d145e29b08d266b38766b80d894d5473e4c4f3b5e436916a36a4333
+AUX 1.06-headers.patch 640 RMD160 ff9fe10e42606f7095f65444b52d45e51f5c65eb SHA1 7cc5488172a305d8c07f877e9a2bdc56bc439aaa SHA256 35e513cd2eb50a9ac5dd97f7f43379d59d0c251e7f65c3d7a6f8a89a0ef73936
 AUX 99qmail 84 RMD160 3d197970d95c91a1a70792d5c7a27eacb4dfa557 SHA1 0ee23bd18e12f85c5b8eae9028cc59006efbf087 SHA256 cd259c9003ec1962562ae7c32c24efbeae54b0baac3380adff59604dd1fd3648
 AUX config-mini 961 RMD160 94fc208cc6c70420284aa9c70a39d528409a921d SHA1 4c17a89b1a542bfa42c13a1e8bd646bee2ff9256 SHA256 2f6fed8f293a8d60cc04091d5684f581ff2253957256907085db3bceaf2f4384
 DIST genqmail-20080406.tar.bz2 10252 RMD160 e6b2982447dbe3e92407435831469fba49fe3c9d SHA1 e825bc226d181105e8723360208d8c3f98142025 SHA256 501ca2120c7619569bd9ac3e0035cb0022bfd0cdc9c720b5c43c9e3a4eb07ce8
@@ -11,13 +12,23 @@ DIST netqmail-1.05.tar.gz 252264 RMD160 e5bd8557c58a2686233449254b146e74389a7652
 DIST netqmail-1.06.tar.gz 260941 RMD160 d31598afa862abb35bc1feb8d038ab619b5a17a2 SHA1 9ee9a603e2ad3d8e1d34b900e19b7a5d275f538b SHA256 8e7d98d15211fc9f9c28109e942e2268f42a6672d68df92a42f2afa90ff00532
 EBUILD mini-qmail-1.05-r1.ebuild 2782 RMD160 509ff3e20079936cb20aae3e1469a230cc17d5e7 SHA1 1f605b02016ffb993462b42a0913b4758b2ab8b4 SHA256 87589e4ad58430be5f7a974bcc1742846042b3be4926ba99acba9f3bc8b07c64
 EBUILD mini-qmail-1.05.ebuild 3060 RMD160 b832680d9bf2f821151410040d2d03fb1c9df8bb SHA1 59cc3501d81adad8cdfd68c2916bda45b995ab60 SHA256 65f569387a1173432fcf78b45eba22fd469e7e9108a8ceaa155f2e52a479af87
-EBUILD mini-qmail-1.06.ebuild 1445 RMD160 8145e539eb397a0a0a5459e65b45808cd939287b SHA1 80f2763cab9e3905152dc8ba14bea21099a3793f SHA256 8adb4775dc7b0d0bf561d9b8aecba91495ecca0a55e00607803d2475c9419644
-MISC ChangeLog 2525 RMD160 b8f04b429b6937b9223ad947e6764657744a62c2 SHA1 575594ca7849914ad64f6e2f83672318fdc4702c SHA256 78e2303d1445c8c47557c3a664b3e53129b6f3ac94c51de665c8a7e91717a54d
+EBUILD mini-qmail-1.06.ebuild 1424 RMD160 96876e756533c7c0e1f0c27ebc37746fc1344bf7 SHA1 4da71a5d0342d4491ae36d3feeda3cb30a354c76 SHA256 1b8e4afc39485efdb750502a36fd42cf5d1ad411091eba2422a5fcc469d9758a
+MISC ChangeLog 2695 RMD160 11548e4fa0b23aa71dd9535d22cf33866905322c SHA1 7287eccd3d78f7b2caad4fd06633bb91c4ccc8a2 SHA256 08b6b7fb393ab522d609921e4bc129e8909d32983ddf7229ab02e3398c99d102
 MISC metadata.xml 223 RMD160 ad5a1cd244f4f8b660bac8d262a4cb806a83d875 SHA1 9d9e86723fcc6cc6ce99a81abbd0e6fca27d31be SHA256 8fea403bc0c5cacddd79abe76f851462dfc01da1911e8a5e2c8b32b294935ad6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7IttsACgkQaC/OocHi7JbGaQD9H5y1/XSGu3Vj4CjZrNLWI8Qt
-vMU2bVOQubWsp8vqerEA/j+y0k1dWtsHASfZgv0TUt+QFlrBNYOhPI8cTw2ELbnH
-=OM0U
+iQIcBAEBAgAGBQJPCRAXAAoJELEHsLL7fEFWzmwQAICeUYPsYZYnus7kikVpTedh
+R4EI8nvPzCBJIWhDlvyUKr1B/un1a9VGSzpBag678X3gpybYKJ5pGZvnvCQOOUkp
+U/xdk7c9N8u/OAeBDC6YS91v9ulQKpEzS7GkTrbD5oDlXs/gaAfdQCpDJbJC4cag
+cM00Z6dj0d/kw28WLcUZrhXGBYVUv7IXS/E3ua9Roq6lAy/NNzu2il0/N8JH7ko3
+5l2jG7awy4u62na8jk1KFg5EXqytjy2YQpyIzmHcZK9FBRmsqywmmJOxKGGyoqeN
+NxELIVZSIT/gjt0rdwJcjYTE3HqxNY+i4GFTc6aC7sAnICJgNrL4eB/xaD51ef+F
+XmSTm+uU/bjCvN3GYf6qtpZi25S7fB3lA2/CUolL6b06dV649WlPeQsdr6cOV/kh
+KE+88xd6Wv3MxUFp93RcnvZag5LPpe+t0ObHD85G/xc2j2tslQJSXkoynWs/qNS0
+k+vNaXi/3AG55TytOJiypUqgQrf9EnA4jj5yZBiqMoAvYXtGO5vSOnIpxt6zVkJJ
+Z/n0pHVhMkQsyHFUDIrtEzH3cAaw/bMDuUQeqf4bPceY1vpgCCPhoXimkIvH9BTV
+Kp8lpzecAPTB2Bu3Q8lmqWZpPZEIDtdjFvzF/hqdchuDvnfkgWrjrNKVQtFcuQIA
+cpAHKQRSDmLh8B+dJPFB
+=HalF
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/mini-qmail/files/1.06-headers.patch b/mail-mta/mini-qmail/files/1.06-headers.patch
new file mode 100644
index 000000000000..566babfa6290
--- /dev/null
+++ b/mail-mta/mini-qmail/files/1.06-headers.patch
@@ -0,0 +1,37 @@
+--- a/qmail-pw2u.c
++++ b/qmail-pw2u.c
+@@ -1,3 +1,4 @@
++#include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include "substdio.h"
+--- a/qmail-qmtpd.c
++++ b/qmail-qmtpd.c
+@@ -1,3 +1,4 @@
++#include <unistd.h>
+ #include "stralloc.h"
+ #include "substdio.h"
+ #include "qmail.h"
+--- a/readwrite.h
++++ b/readwrite.h
+@@ -1,7 +1,7 @@
+ #ifndef READWRITE_H
+ #define READWRITE_H
+ 
+-extern int read();
+-extern int write();
++#include <fcntl.h>
++#include <unistd.h>
+ 
+ #endif
+--- a/substdio.h
++++ b/substdio.h
+@@ -1,6 +1,8 @@
+ #ifndef SUBSTDIO_H
+ #define SUBSTDIO_H
+ 
++#include <unistd.h>
++
+ typedef struct substdio {
+   char *x;
+   int p;
diff --git a/mail-mta/mini-qmail/mini-qmail-1.06.ebuild b/mail-mta/mini-qmail/mini-qmail-1.06.ebuild
index 636dab53bb28..6deb82bff631 100644
--- a/mail-mta/mini-qmail/mini-qmail-1.06.ebuild
+++ b/mail-mta/mini-qmail/mini-qmail-1.06.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/mini-qmail/mini-qmail-1.06.ebuild,v 1.5 2011/11/20 08:14:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/mini-qmail/mini-qmail-1.06.ebuild,v 1.6 2012/01/08 03:39:59 vapier Exp $
 
 GENQMAIL_PV=20080406
 
@@ -45,9 +45,7 @@ src_unpack() {
 	unpack netqmail-${PV}.tar.gz
 	cd "${S}"
 
-	epatch "${FILESDIR}"/${PV}-exit.patch
-
-	ht_fix_file Makefile*
+	epatch "${FILESDIR}"/${PV}-headers.patch
 
 	qmail_src_postunpack
 }