mail-mta/nullmailer: Import header in portable way, #538482

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 54 insertions, 19 deletions

diff --git a/mail-mta/nullmailer/ChangeLog b/mail-mta/nullmailer/ChangeLog
index 90b3ce2a487c..f2605ea70a61 100644
--- a/mail-mta/nullmailer/ChangeLog
+++ b/mail-mta/nullmailer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/nullmailer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.91 2015/01/05 12:46:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/ChangeLog,v 1.92 2015/02/02 11:50:13 jlec Exp $
+
+  02 Feb 2015; Justin Lecher <jlec@gentoo.org> nullmailer-1.13-r5.ebuild,
+  +files/nullmailer-1.13-unistd.h.patch:
+  Import header in portable way, #538482
 
   05 Jan 2015; Justin Lecher <jlec@gentoo.org> -nullmailer-1.13-r4.ebuild:
   Drop old, obsoletes #521552 & #532588
diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest
index b31a8de4c3f4..3cd8d7ff4445 100644
--- a/mail-mta/nullmailer/Manifest
+++ b/mail-mta/nullmailer/Manifest
@@ -2,29 +2,30 @@
 Hash: SHA512
 
 AUX init.d-nullmailer-r4 1094 SHA256 91d39a07d712f03be51e15682ae92ce4e260e6add9f3c0fe452db9121d2b5022 SHA512 86554e37fa06a3e58946f283324206638419a78a48e8b754a1546b49dd26c7c9c165a192d5d3b9ce0db423fe4a2e9fd98818503249417c9cac999d6de83620d0 WHIRLPOOL 29a130e1220926af4a9ce037662cf40d2bdd152220b7adf44c0b04bdc6ddac93800a298bc06e288fdc3944836dbd9252d6a43cad5304fa07895c9da6189aa21d
+AUX nullmailer-1.13-unistd.h.patch 867 SHA256 bf35fe287b014b75f4eb42d744597a806d40b80b712fb8318ea4408fb6e8219c SHA512 0a46f6a10a380a3b5b1527d60eef768f2e1b94b2848c4d866bf3088f9b1592b3fc464c69d2559309adfae6fc8f46f3897585d736b37947239106090c3449aaf3 WHIRLPOOL eb65af25f5dca3f8aba7dc15c96b3ca5e93472d63d8abb6f1a8c7b570b10bf8deb86c7a690bcacb4cb4300477c5a546caa0625338a42ef31f0acd0ca30914691
 AUX nullmailer.service 401 SHA256 2fe58518b9a024c2136bd6b20cd7bd9458a37f32bc3e6be1203cb5711e8b8ba5 SHA512 5aebb237972a7ff20a34d40d53d8d3146966c8f12b20695aa718831a6b32ecf4a0cc9d5af41067952c454166d02d52226fcb397b48310907b81deaa2d874adb7 WHIRLPOOL f81a87473ce5c4f4717aba023ce62cfb72b6b964b6c34aa7dc25f5826cf5ab41eeeed3d3de329cc6abc662fbd4436a1b5bbb744b09dff4be75cca84e8cf062e0
 AUX remotes.sample-1.13 970 SHA256 56b9adc7762cfac88769ee6a87fa5057a42599a3d50a3cfd1c6d8d9327d02080 SHA512 8ff23a3f30e9f3b8bfca05f6e8bda44d8142b547c667d604e5e1f15b49342e0a098591578ef26c599a965d0b17e7237232e6713bb7b95b2af4e3bf6bde2604c6 WHIRLPOOL 39e87ec264d023c4d3852d1173bf9e87b8eb35fe3809c9ebfa3d2c9be81ad9a709fc1c873697be8ad80c01881566542cb8950a5e312ed9e06c65535c8cd4dac4
 DIST nullmailer-1.13.tar.gz 205431 SHA256 3f8861ebb1b46cea0a1caf1e6236e1e0d2a5a91def19551b7cad12eab676277d SHA512 96dcb3ddecde77a73e5ca1afa5167d35f965d04999f02cc2ef60b54ea7eb7a006e5cf5678fc34a54d4be4f9fd71bd0f784a8671aca40c70dbc307666c548e1d7 WHIRLPOOL b041f7cc33a257fad11c5f4c9bf74f8d849d9c45f0dc19be28268462b9d029c07e1d5802698e647a4208d5f66cac2177a1d12e49a03caac51e0244c3f9a0599c
 DIST nullmailer-patches-1.13.tar.xz 8384 SHA256 8685dfbf23e9dc15269b1a0d14f700c4ef990cf49d4e6e830c0217289e8f4733 SHA512 393531e39a92b0978bccbcdf123e05b2cdad1ec8e600825cc24177ba414c1f615995c0344291ebb664f42b384a160c0359fec5ba3308cc14cbc9ceb8577d799c WHIRLPOOL 84f523be7963ceb7fbafd3f5632571e7bc12085b1b4bce5bb5c63871fd6c7ed1367a49ddf5ed66acad7055e28856b23fb1dcb59e60158fed26447128edd0a4fa
-EBUILD nullmailer-1.13-r5.ebuild 4810 SHA256 83d4636f376a4e6f76c46405e0b4c860c88556f594ab764866a695cd5e5dee0d SHA512 f19fcc7fa3d3c326356eeeca954353636fd1badb38e13ee50c7c4cfe821270fca7f561a503d0d45e84836a59954e04c28980e4f4a6611ea6bf939d186deb63a5 WHIRLPOOL d8c2982411f056ad1be0bd6f5a83473ebc322bf061d53f99b6c69ccae3646e78da5af0232a2ddf81809ef97230b469799b7452dfce5c4a5fc8b794724834f8d4
-MISC ChangeLog 16326 SHA256 707dc5811173c1622e66d4dfd7f063abb525573a8986c88f99e2322a1aa84384 SHA512 e1a5fb29a5d82686691da543e063411b18adfd9ec5a9f198f80e897ab5a4b3425d432cb2edc08b3e28acdaed8d75323a3a752a7edf935c3d0690d1b7d4236851 WHIRLPOOL 60749ed97297c103861a6783a8ebd96c381d28245acd41472862ab2e0f18680a7dd384a6a49fca0cc3d96cece356d859f436267cb95e60efc566a568d4df5611
+EBUILD nullmailer-1.13-r5.ebuild 4854 SHA256 35121b2f5dc8f5cf04adcddeb0ee663db7e8c07df016feaf48992292ad9ab88b SHA512 3a1bd8dafd91aabb93b5c886fc8e8607cdd7cea7f7aaba8ea7f9ef9ceeb90fc44e84f3d899c7ad4c6c3706f68f870f95d060e4d20f8dc4b81bab90a5c5acf00f WHIRLPOOL 624f79d51628c7e11f3f101fc72600f3c8ee9d79c893e8a743c7402de12335080d8d24968413c72f73d36a9cd7ae71279098278d0b6287c5d3be065e3585d946
+MISC ChangeLog 16483 SHA256 a87419fcc107e36171d57456d7ea31004f55acf4f151e710db12c3062ecde03f SHA512 f27439e6b2213205d444030152cf885dbbac649563b4e73f46607d1a31cda68f1e3dc08091707952476cca4b9c2b465ad1e4012c77e821682c6a054865058e2b WHIRLPOOL 47b8cd3feb99e28a2bb1f0504a2d7e8c26a6d300e4ad76226e3bbd640c5b7cb69ad409c71495dd050cdf6431cde551c26c6626adf7ad8a19354affa854b9608b
 MISC metadata.xml 363 SHA256 838fae6a4f4cabb0217b0d1ebbd63acf840e802b3852e7360a4b9ae12a10459e SHA512 18675ce1eba12e093f0d73ac35ca6e456d2d7c0b1f3eee41d9b5bb466391778e3aed877d06028e7fa28c121dfff20fd6729451e5c5706a5ebc33a4f3c10c6f85 WHIRLPOOL d8911b227b42c2f4e47d68cb72f65c1e3349df2e34659aa4a597522138e9f8b055913829e504e11492db81081fbeb51e4b62512aeffde65d105e1120fbd572a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUqod4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUz2R2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FViroRoP/0LNSpKTb7hCCARBL0gXIrxG
-nmwECZsgLzI1jXwzgzzRzCiJ/SRo7/nUglPxCWpyjrin2BhD6dNS1/kyDbs1b3cd
-SjBP+CGMtFL2MJSxrD/jqUlLyoDHTLtRTcwR1RAQ/3oQNngdbA16C2VVO5e6vTZb
-BMelX38og85cPXwi1kMWRUtl0FmmYW0qh2n73cnob9Lr349wL5/gBY/NtDzo86or
-0kE4XUAcEB8C4cE/ShYqyMkwroo+A7rd4Iv+MfTMY0/5Vx4efTsWgZK8oSqHqr3j
-+1cVsimWHE6VIcnYB/KOn7un0Auo2VI/uqdq9EF1dQ4oh/1gtHTug6ycCzRqfZYj
-5ETSqJkSYr1LVAY5bPy9lujj4C8loiS6fI7LgSUAnjH4ypgLM8PWzKmpnc7+vm38
-mmux1ohsDZ8wVyQw/wWPD6nM0Y24k+cheY8Zo1cz7i+MfCWfqG5srEjILviCs31T
-WH0RswsU6ACur5x5JjUUCj2hKa2mIwMneoJM/RuGPPq9DTzvceIkSuN3OKUGXfgC
-6GJh3mOXXfW8lntpAksli+L9riVExRAP9Utz+g9kExXjFHxY5APt/vD/InUX+axq
-0z93fTe8ZwlqF2aagfIKrWeuhBJmhz6NgC7QgCqZ6zROxqJEFTnw08jpEhSGwZtQ
-pUkdpmPXzhKT/KC9pZ0Z
-=HIYc
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirxTUP/2PAmKdOINzMxJoBfh01jfRK
+vbMTIGlS49SIjf2G2YCEwQvPmqTsptGmzt40xC85/ByRL8gRnhMZyt+hjo9NSCe1
+ifYBJGaYX6rwBeenvxx7PZJiUKqAQxzKBzKHPvA7JTElccKtAdyqqgFUkNwE5rvO
+87nvnUUMUVHVs2/dhai1CTfuZ2upCzlXNUu8PmJuVAR7FYi0/iRKeMcG3njhNjlt
+CGPZeGOtAkhkAoF7uSngtWrppNDz1Ruy5iChb9IPENKanX1JuVXHj101mzrdI5dX
+yce1bwZ0jINE2XCvnh64JYXL+jQoVjkA+l0bzZlj7ZnqmD2giX0Oyqv2g31Gh4Hj
+tMjueeb+ebaFiORUNUMFPhdo5Ct+MVSNttb0hSP/5/6VsL7L4532oRqxOJrJXoyK
+Dt7zF2Y/NdVHspDRwb6V25a0HJ9C/eeSBMsWnfF68tGWXl5l2H2sk/hF++g5Ak7x
+o5Ima+iULJ4dHYU9fD/NqtTk6IXWMulilwdurPOpbemhkdsdd/duqN/8+51NM2Wc
+2UIZfsB/u56u6AW9YBh2+R46bk0nbiS0Unu//tPJhwbvuNIkCWJiBIx7ajOXM+38
+OcIW2TDKQA990dllyWh55F39opq37VyNF5U6Vnun18J0AMBqp5PqpbZbiE4au0cA
+Ak/GnSLAnvmi3Lvbj1s+
+=KrX9
 -----END PGP SIGNATURE-----
diff --git a/mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch b/mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch
new file mode 100644
index 000000000000..8199b9627f47
--- /dev/null
+++ b/mail-mta/nullmailer/files/nullmailer-1.13-unistd.h.patch
@@ -0,0 +1,28 @@
+From 5e9316c669e752fcd9058b28952919bccd967640 Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <blueness@gentoo.org>
+Date: Sat, 31 Jan 2015 23:55:48 +0000
+Subject: [PATCH] lib/fdbuf/fdbuf.h: include <unistd.h>
+
+class fdobuf in lib/fdbuf/fdobuf.h makes use of uid_t and gid_t,
+but these are defined in <unistd.h> according to POSIX.  With libc's
+that adhere strictly to standards, like musl, this breaks the build.
+
+We add <unistd.h> to fdbuf.h which is included by fdbuf.h.
+
+Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
+---
+ lib/fdbuf/fdbuf.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/fdbuf/fdbuf.h b/lib/fdbuf/fdbuf.h
+index 4b0e9cb..0054b01 100644
+--- a/lib/fdbuf/fdbuf.h
++++ b/lib/fdbuf/fdbuf.h
+@@ -20,6 +20,7 @@
+ #include "config.h"
+ #include <string.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ 
+ #ifdef _REENTRANT
+ #include <pthread.h>
diff --git a/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild b/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild
index b47a12a49f34..f0835b56c265 100644
--- a/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild
+++ b/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild,v 1.4 2014/12/31 16:20:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild,v 1.5 2015/02/02 11:50:13 jlec Exp $
 
 EAPI=5
 
@@ -66,6 +66,8 @@ src_prepare() {
 	# DO NOT APPLY patch 0009... It breaks
 	epatch "${WORKDIR}"/patches/000{1..8}*patch
 
+	epatch "${FILESDIR}"/${P}-unistd.h.patch
+
 	sed -i.orig \
 		-e '/^nullmailer_send_LDADD/s, =, = ../lib/cli++/libcli++.a,' \
 		"${S}"/src/Makefile.am || die "Sed failed"