From: Anthony G. Basile <blueness@gentoo.org>
Date: Sat, 7 Mar 2015 19:43:43 +0000 (+0000)
Subject: Fix type for pread/pwrite.  Bug #541694.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=804062f6d1cbbe13620033c9954c3f2ad59eaae9;p=gentoo.git

Fix type for pread/pwrite.  Bug #541694.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA
---

diff --git a/app-admin/longrun/ChangeLog b/app-admin/longrun/ChangeLog
index 10f225968606..0aff9018460a 100644
--- a/app-admin/longrun/ChangeLog
+++ b/app-admin/longrun/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/longrun
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/longrun/ChangeLog,v 1.25 2012/11/18 10:47:19 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/longrun/ChangeLog,v 1.26 2015/03/07 19:43:33 blueness Exp $
+
+  07 Mar 2015; Anthony G. Basile <blueness@gentoo.org>
+  +files/0.9-replace-loff_t.patch, longrun-0.9-r4.ebuild:
+  Fix type for pread/pwrite.  Bug #541694.
 
   18 Nov 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop mobile herd as talked in gentoo-dev ML
diff --git a/app-admin/longrun/Manifest b/app-admin/longrun/Manifest
index f37a05073f91..febc6d56cfc1 100644
--- a/app-admin/longrun/Manifest
+++ b/app-admin/longrun/Manifest
@@ -2,15 +2,26 @@
 Hash: SHA256
 
 AUX 0.9-makefile_cflags.patch 577 SHA256 b6a6a4aa96047c8f4fd398270784e1ea881f5e2a56f212af79b0008d4cd3f823 SHA512 a461d9fc0b1a0d7aa2f36c02d5121b2a8e433b7254f08e53a6a8b8a7cc0ad25bb707a80b6d07148543b74aa78696868583e1004a64c631694eef85c787cdd051 WHIRLPOOL 17f287a497175eee8f9fd6f83c0cede36c88431b4c4efbeff6da00c6d6c931afceb31c35ab2b16def00c446c212e8df6814132fcc07abb669b66930050c6e3cb
+AUX 0.9-replace-loff_t.patch 992 SHA256 96da9a90490f0140047f522020d86f26d1d64f9ee18890cc86c84cb58731fe56 SHA512 6eb0e828afcd6265babd4cefd50191610095c8d6309b75089ecf3f34363231bf8a2b68c3db0d3938904951035232b9bafcb2029de832e9c7515922dad3ceac1b WHIRLPOOL 56f8c977c57d372010037006ce8c865941446f0c3842b7555d7e7b4f618135b8aff79c85e1b6341e53ab1e2d1661f91e47954e145d708057169cabaf170cf09b
 DIST longrun-0.9.tar.bz2 11539 SHA256 85d2bb0694ded7d727c3f819b12432a78b7c3d9723580d17d7a9e3a21d969f7b SHA512 6b38160f54d0cb9124c46c0e3ba22faf4ba4376ef58f7db40aabbab20836b1551dd839d28e5bf49540a5ce0e13312bd1d7332cc59ce45fa49f81d0b9746ef055 WHIRLPOOL 96654665434f789c8fe84d394161b5b3fb2a4d3ceb8e2decf67ac52ffc5ff2f2b51ea885aae8a1a428fc0d1a4c00848deaa1ecd28f48ac1abd40291c2feb06e7
 DIST longrun_0.9-19.diff.gz 14697 SHA256 4f9d133c8739ac2bbf0ec53d1356a42064b9b06b3559a93af538c809f851fc14 SHA512 591519183017dd84d6f78554eea9f215be9346efc3f30889f5a25d01c6b68bd5a949507b9a0c871f9aca0b49e415c4fa261821d4158b24c93481394403b83e35 WHIRLPOOL efd02ab3b3a949b77edf1b04313fca51482b50fcd5d2b73dd66a225218e04cb67eb830aca1b15b63582dcbcad1367acad88532c8495b074e6d23f3c4e8f071c4
-EBUILD longrun-0.9-r4.ebuild 1957 SHA256 f65e7dc25491dca6d2ff68f29d31b376153feebf992e9c39ae22e885257d0b34 SHA512 837e5d6d22094c92e63b4f4885ee9c8cc7c5fb085f84a624c64c5ed0de305d4c82d803c573f32c94e4cc16997673bed3a2b6ce7ed1c1a56ea0d732a528bdfb49 WHIRLPOOL 5338088960d6e25cef6dc96dab0d3371e6f8ee8acae72eee9755c98ff4e4c751db6f1280f11e79a0bb1d8038265825b4051382c1ac5acdf8948a66bd544f4ed2
-MISC ChangeLog 3512 SHA256 38ce1a93e8ade032593e88c90db6dd66ea0fd597223aeeb3eedb1346f0885fd5 SHA512 a0b3a26f7b428bb24b57a4417141a091744a6e433f9b4de940e40300f5d1258d1eef8312d5f0ea9b7b6275ead601083f595b933e72af145d6e86f595072424e3 WHIRLPOOL 2d5fcbe92139801b16e5534a9a4856aaef4ec8a9ad94711dbee5aae0645549ad7beec62b1952ba9aec9810ea0abc8e5313d7ad49727c923e441bea4832c6c24b
+EBUILD longrun-0.9-r4.ebuild 2008 SHA256 4a1fb894c3fb8b7c8bdbfb0238b853061e6e9f8a7bdc037c95da89c7fbddbccc SHA512 3a421c865df1913d413619eaef990915ec602029b9f6ee0c21e1744c7fe64423c075ad7dfbc433cc82aed2f67d1bb504954cc05c37c7c56d1a877e92945065f9 WHIRLPOOL cf825da99e280c795458e0bc6006dc110ad99caac4486a9902332d3618ab42be9ccff861933ee84d14ee09ef6bbd138518e80db0ec7d817b17a3dd7046906ad9
+MISC ChangeLog 3672 SHA256 073cb15ec2b8b8bb77f0d831bc5a6a5cdff8128752fb32d4aa22b54086a70197 SHA512 d48f9d5201193cb999417ad6aeb819b94f92b430dbd0cea39802267ba4b8f15054fcb96b1160def3e3939deec1c4a90432800f9448ddeee89a99a68293273e66 WHIRLPOOL 65a49f0ec17cf6e05af27707e2d5ce192ed8c24d3f31328090fe5075a00debf8b3d3dfb5a17393bb3a8a1d1b3e2fd161d0b9fadcc564ed91b013644a2c8b754d
 MISC metadata.xml 395 SHA256 ef88f8e993d71ca7aa814f6423660da19ded15f42942e44c8da75c95a1652e22 SHA512 d66cfce8b89a31db59ecebe451bc157aaa64fb86538360a4e37e9f33424e03a283708c84b47d2957f265ef79dab176cc93eaecf1cfaafc92b127926a11463303 WHIRLPOOL 8d325e0c29cf7cf3adb64f6c52db265be9521fce045b9b4d49565e0ab0268ba4d9cefb4b5c9966790126b40bed7709be7920376f51bcc2fd3e20ee290628df9d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlCovLgACgkQCaWpQKGI+9Sd/QCggsuHegE2F/2/dm2IKwyT/zPl
-MgYAniCcB4kAomRGPxSOuKRg1qQo7npI
-=R4Pu
+iQIcBAEBCAAGBQJU+1VxAAoJEJOE+m71LUu6VecP/3RTTWoYDEA5dtryya+aIb94
+lFBMYj+OuuHd8f0ld1I5PUMYnF9YBTQm/JqS0YE0Gf1ko6Pfl0mhyJxnw0tUnKQv
+gio9DnKOVpluaJpVIY24IlkUzByg+f4ERNyNOy529VJCldtSogb5ZybQyJwUrs/Z
+kB69wRzQ4tF16A4FikSOty+wda1gxzmONxtZjrY3NfRsrcIbmQ9ksx9+mVdeduSu
+V4whuftz7ca18wdwGoQCn8kyOZFIfHhoeD/hwcOnS2FncclWj7Z6erxcnkkdd2d8
+v7H5I/YikrUmolKdGTmLYe6guXB68IRyhU0+cTYTKWj0Nr0CMo8pBzIXMN88fmaI
+MJ0uC0LvcNkhKfcfelzgbByFep5gAhhB3mfvLxZyziWqP2WLQ3TfwdpqNEMPfEtW
+js2MWRWOK9ojlluaoYQFgVjNzYv+8qxhp3pZgPqWrItifelMMjCKqi24OfAa3/Wi
+G+02J2vHlQ/vvqwp4ZdEW9Ok4/22GQI1+kpRPMSYJNG4VG/6JK3rPac5G78hWfKc
+qsXzp8kKfIkLSs9p4xWT+Y2yB9ASHNtyrRp2eZsqMY6rON2UJmIyzHvITdj4JSBp
+5Oe17TXR+JCjdVCEavm+KImjLCBBZAdJcPz13ZhoVreNClhbztUi3JJWBwinBTLe
+Uyjrp17cNkRkSrWrWEmo
+=3+DF
 -----END PGP SIGNATURE-----
diff --git a/app-admin/longrun/files/0.9-replace-loff_t.patch b/app-admin/longrun/files/0.9-replace-loff_t.patch
new file mode 100644
index 000000000000..589c0947b155
--- /dev/null
+++ b/app-admin/longrun/files/0.9-replace-loff_t.patch
@@ -0,0 +1,35 @@
+Use off_t instead of loff_t.  Both pread() and pwrite() take
+off_t not loff_t types.  This breaks the build on musl.  See
+
+https://bugs.gentoo.org/show_bug.cgi?id=541694
+
+diff -Naur longrun.orig/longrun.c longrun/longrun.c
+--- longrun.orig/longrun.c	2015-03-07 19:05:19.166652462 +0000
++++ longrun/longrun.c	2015-03-07 19:06:05.419651899 +0000
+@@ -181,7 +181,7 @@
+ }
+ 
+ /* note: if an output is NULL, then don't set it */
+-void read_msr(loff_t address, int *lower, int *upper)
++void read_msr(off_t address, int *lower, int *upper)
+ {
+ 	uint32_t data[2];
+ 
+@@ -193,7 +193,7 @@
+ 	if (upper) *upper = data[1];
+ }
+ 
+-void write_msr(loff_t address, int lower, int upper)
++void write_msr(off_t address, int lower, int upper)
+ {
+ 	uint32_t data[2];
+ 
+@@ -206,7 +206,7 @@
+ }
+ 
+ /* note: if an output is NULL, then don't set it */
+-void read_cpuid(loff_t address, int *eax, int *ebx, int *ecx, int *edx)
++void read_cpuid(off_t address, int *eax, int *ebx, int *ecx, int *edx)
+ {
+ 	uint32_t data[4];
+ 
diff --git a/app-admin/longrun/longrun-0.9-r4.ebuild b/app-admin/longrun/longrun-0.9-r4.ebuild
index 461226fb9e48..7bc2389d8144 100644
--- a/app-admin/longrun/longrun-0.9-r4.ebuild
+++ b/app-admin/longrun/longrun-0.9-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/longrun/longrun-0.9-r4.ebuild,v 1.2 2009/11/20 14:44:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/longrun/longrun-0.9-r4.ebuild,v 1.3 2015/03/07 19:43:33 blueness Exp $
 
 inherit eutils linux-info toolchain-funcs
 
@@ -41,6 +41,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${DISTDIR}/${DEBIAN_PATCH}"
 	epatch "${FILESDIR}/${PV}-makefile_cflags.patch"
+	epatch "${FILESDIR}/${PV}-replace-loff_t.patch"
 }
 
 src_compile() {