Add fix from upstream for implicit prototypes.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 73 insertions, 17 deletions

diff --git a/sys-libs/e2fsprogs-libs/ChangeLog b/sys-libs/e2fsprogs-libs/ChangeLog
index 070a2ebcd344..75110ff39d54 100644
--- a/sys-libs/e2fsprogs-libs/ChangeLog
+++ b/sys-libs/e2fsprogs-libs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/e2fsprogs-libs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.122 2014/07/23 15:38:02 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.123 2014/08/05 07:57:48 vapier Exp $
+
+  05 Aug 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/e2fsprogs-libs-1.42.11-prototypes.patch, e2fsprogs-libs-1.42.11.ebuild:
+  Add fix from upstream for implicit prototypes.
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> e2fsprogs-libs-1.42.10.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index a53951049d6a..59556cd0aee5 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX e2fsprogs-libs-1.42.10-fix-build-cflags.patch 370 SHA256 11871291de4605c6a469327e698e51a611c786451ef3ecedf20bcdef75c9e50a SHA512 a268390656dbc6ff5217efce5d38686de70de8d2c566b117a53c42fd829178ab07f300e10017623dc3931084214ded620e05500992ff8371d47c2d90764f58b7 WHIRLPOOL be6a71d843a1f9250e0fcb4ffc7ac0d4c2eb5e56749bbb9fa4da6eed181270c3cff2a36241738beb959959bb9de8ceba079cbdde844f16d5e302c4ab84eb2e71
+AUX e2fsprogs-libs-1.42.11-prototypes.patch 1440 SHA256 e05efa3e178e2df1a54fff3e27613c34151c00e839a7a3530457dea047fa2cc8 SHA512 71b4536e1402203ffd195dd8c62a9b7904e63ce757c485178ad3a7378630660b04e0019c0304136f092690c9ea6546a43fbb2c980b635e0bb28a3360e3e49107 WHIRLPOOL 42705990590084b25b00de312b81f37fd58a25ebf88af309b5ae1c4777a1eab5830ee19b48c784c4773ee8ba10d3afc19a65e9222a25e86d854c643a236961c7
 AUX e2fsprogs-libs-1.42.9-no-quota.patch 1247 SHA256 a7d8029934ad38e59c29ce641d49697a013f840b116e2d26fc12f78c8d03850e SHA512 32ece07e83911c1f9be76e7ecd57f6876dec864cdc5398d277dd83829b91e316835732156993cc23b580d6cdeb35ee7cc1b5c1cb1b6e0971f9b956b344845fe1 WHIRLPOOL e544cf281884c8a110d5958cabda2b7cf4b262025d57bcdcc5bd5786465d56d5c81ef0346b69ffa532ed89fb9e631c23ce0cc05e0871199103e70253686d9fbc
 DIST e2fsprogs-libs-1.41.7.tar.gz 494463 SHA256 b6d9c9ec405ad1d644cf35d57f0f1e878fa6af6ad45b97683de847ff49cbdf84 SHA512 01bf6571efc3b63b985bb45190553cbf0e486ddcf022715a2bdf36eb3e45ffada603ed52bf17d6920b9dc3e98ffc6758d2481a83b68bbf5d946c76173f7d14a8 WHIRLPOOL 058fc1278ff2427d956728ad2d132652e80b60570c20c904c6d6e2a15c4a9d00ec13340ad56114f82dd703ee87cd576c2f69eb3d40f1f16743430476c3e383b1
 DIST e2fsprogs-libs-1.42.10.tar.gz 575703 SHA256 236ea5124ae7c2a0d0bc4bc5927e614a52da2635fbc3b2187ca8bc415bb3644d SHA512 97be305df2debad3378f53ffa702e0719e76f9541c38468c78c32e77765fb0ae95b927dca4d5032268346792e759cf02ab9542c9e08c0b9f58ddd5276e2e0362 WHIRLPOOL 30b8df6b6fa29449d5ec90c435fc1f234d0e59d6012015a00c603139f400ad46708cd444c88e3693247703171d3e65275c3204d7d5f53305b7a412fc7d6cfbd5
@@ -9,24 +10,24 @@ DIST e2fsprogs-libs-1.42.11.tar.gz 604886 SHA256 8b52d20c6571155d2adffafbbd5d215
 DIST e2fsprogs-libs-1.42.7.tar.gz 571544 SHA256 21ce9cd879c401d08b057a9abda2b56d70557239d1f5e42674fa2c20509c2145 SHA512 2ffd37edd156730d2cc5c685e0d082c171ada626ced40a86623d937522fd020c9215fa287de909968cab366ad8a1aa84a6de8e4eaf3fc1effb103000448bae0b WHIRLPOOL 12d4f309feadd957317f97f44c9c8cf5552ed27e0f22e2061d39e8abd2732fd512f38127a0806bc913ba92c64894218efcebda1316d74b6a814bf7f6f94152df
 EBUILD e2fsprogs-libs-1.41.7.ebuild 1375 SHA256 1d0cb56ff0730d1e7ad90825df12610c3d869b6b830e5c85401b005b8b61432c SHA512 057f80553e38cd72a81621f8691fd8fd59f26542ad1205c7896992537e86fce584bfc309110bb2267ffe5109ddca07d248fa34b0c05cf0eca41602eab9aaf8a6 WHIRLPOOL f9373e687b343912c5442488fb90a95dfcb322232cc15a6b39ce8bda09e1c592a1d98ec141356c841f695b14dc75e2e5829c8d31f4776f2540edbdad36324150
 EBUILD e2fsprogs-libs-1.42.10.ebuild 2023 SHA256 3d428208aa273bf66d4a4b5605900d712a35ac98022bd4a46027bd3a9426b706 SHA512 8d1b9be851b294266731db127c50b086215319748594bbda0fc90b7128971ac1d35d601b28be5fce63f4a377d5d14d98180c6fce01c9195cfe603889f43ad357 WHIRLPOOL ae0fc093edcdccb4cd7aca650713187e8fc9de8ff882c28e0f79ec3a310aad06317f05de0b72f56dc2d2498afab2dde4aecde37b3525b62e31fcc3556f23e6c4
-EBUILD e2fsprogs-libs-1.42.11.ebuild 2047 SHA256 40927852dd2c276f18c6f59e75e6f080cbc496c4fe0f9d14662ceac5744ab3d9 SHA512 a602bdd411d0f060f2638c8f743766ce02f3efdc2c6a9b3625d04cbe03a8c1ad9417456c3a3939bde17ab833098d9c80c94e0c929763097f4439149e229b4605 WHIRLPOOL 842a9ee1de0e2de1c9c34f2a2505601640fbcabb35a5225307524d3692bb1c1fec6260fbcdb9ce2b0ab9a2c209e34f68a42a5f98633817d54afcffb0ad3336e7
+EBUILD e2fsprogs-libs-1.42.11.ebuild 2094 SHA256 e7d3cdbc5bfa85aa1f24de27b2a9028c221b7e4010601300c11b3078296fef04 SHA512 226d009f4b5e718e88d4613f32b5e176dfd71b994d6a46467bbfe763b0cdc25f3447f835d82cde0402660dd49f5460c662159eeb9ace655d034175284995d2d4 WHIRLPOOL cca7a8042e2f77a9f819d3adcd7f4f573ccf5179339b8d3a2a9e78d56bcb342c646762583c6a95695b7b9ba79d6cf5a0eebbb47697fe8da8f29ab4798afe1f20
 EBUILD e2fsprogs-libs-1.42.7.ebuild 1741 SHA256 7dd297867ba5761579b258217f5eb537a769a7347d59da362b02aafcd1e7f725 SHA512 87096aa2a4fa5f7aa786c5f05fe8a27775e3c51f57c3c0a21e42e8478026aea745bf50335a3c1ccfb75e74de5df3b61311549fcea403d8e1abf9bb2d0bbe6bb1 WHIRLPOOL b611adabcf9c0160ec77c25edb2ad588cd4f1c49e56e5a0ad95388c9a36d422737c16f9e73e1bcb4e76c6e4a60a338ad253f038aff41830404893de67412d70f
-MISC ChangeLog 17229 SHA256 b1eb932d80541dcabacf31ea4efc2a7a68a3c4658191f9a65cb0afd5dd2ff956 SHA512 1d09b1b8c6cba516997d92d470567a4c9f2e7be69f498a160560387626b913dd60d99652db706f8102aabc069f49bfdafa7ded8ddf908b2b90a456f72853a2cf WHIRLPOOL a8c5cc0912e05abcd44ca58940424b43a0e493d26a2c3a76187db4d040d43499508f84d1ee06ed3efd75d4dfb62ddab19fccf7951697aab1477aa286ffee4c85
+MISC ChangeLog 17413 SHA256 0661efd43ca116e5eb5a93f3d09617d6b668f53c088938e6df3f0467c6336d1c SHA512 8b6194b0883e1d6d90b9b925c45df402b57a83109874f6876d83d960f8c049a325490749406ec4ad13177a4b0d67fb018d723bcf579b35e98f52129bd01dc2b5 WHIRLPOOL 5796db387a852b1159c3e9f9f42b663d4534701f3653856a55af2a9385cef7263b0cb5aa5e0b956c251175f97caa6560e08f181c35b62596e47b92955b7ce5cd
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9bbAAoJELp701BxlEWfx4IP+gJjvebYaGztt/tych3fBeo+
-Ex/mDYUqC7jSrDG+UARZKwlXyYGgBANjV+pT7JYUcjQlk1f8VAIrWGI7UG8psGl+
-/dd9bBxKgQXPmDYvxtDRYHRaJftl2BNFpqEz1oaPNNCS2VEYAA5jobAuQBJ5nm8M
-Zfn1zqeHt0V0zC6Um75jlrywFWGn3RFQJ512G5uJNNoGudZosfHUmySnfoQj8FAU
-gZv50gilzw2E8S/oCFS5SnCqaljY+NTmJxfU5RecP35iLajccpUS05viZbju9XnJ
-cWbAPNDXVQHcc/17XvFlp5kv+l3/MXYiDnBQhQDvp9mNAJcw0N0R5GBRwWtw4m/a
-IEr1RiOXbM53WP8TwUVBWWKD/rq5KaYQKAGrhVlM4k5jaTS8TQtf/JQpkGpBJM4+
-08W+BAwmvA7eqQ+k4qnamfCnZ/EDhRYwAyP8hZrP0RqI9do37Nb7d5eFOuzf33nh
-qgIngCPHm7iSUB1nzRIWEGQv++sKufsXHyrueGUr1Znh/Q/o1d2sX/QAr46rw6Uj
-ZR5k+AERsTlFtXeZZ/czaRoMKJr8IykVRVjioyOP+wUP+YNDJjb0MMtjCPhJ5DGP
-qr+EWUGHuC3Vg+FGkIxhgMS7hgdPnZaUyTZuhKgtzHmsrRwx2A0f8jkxib3tvGZT
-OWfXlPMTaFh+b59CD0Lu
-=i4Te
+iQIcBAEBCAAGBQJT4I5+AAoJEPGu1DbS6WIAt1MP/1AkvV4J4e+cC8FivzFq4qyL
+0JP2/mzXsZlDKZ5jMtzsncQm4H/WTrXG6uTUHkAR1Oe4OO6P3S3UgSRqkTuxeYk+
+olWTAp31YSC0vzhVLbpbE45vj7mO41SGIchAuNUTxTlecOxK4h9jAtaWrFxQ+sPC
+SgeppGPT2MWgqm5v+o7hNi7pYS1ZgtVWjLIstOn8YIXIIzM1+HPkayp0+rimpVxz
+PgRZEQmCNdgL40V0EGgRXWqwXxst7WjewimDFUuzO1wEDyIXuDGPZs1hpnCwzYII
+u8Brv7alg4DK+Y7HPbCLskpi1lrKrfm75iY4xHTO67+4tDbuYV4yJqF3DCpt1+Ye
+ISvpwPPp9NKbk68ChzG5+eP53GNA7jSGK4Ume+su3pT5PSCnK6TiBaRtRXGkM7jf
+VqG62l0nr6F0DxaSbcIAyiVmbH+6JVBmVoMcbrdHglgMACWNF6ALrS/6aV85Mpaj
+Xm3vKu2PEqfwd1R4g1o7D9QaK2Rlxz21xu6XH/8wyFbTYEg4ldVVFD8oR5PmMtCt
+Go73vUaEeS35/r+8fW9UNkRjHgCNsm4VSSnsS8bu//bISJLtbElHVkCqvTex4e3P
+xqquY9TSSk6fseefE4oXKnmUxMYr4cIYgrpoNZVIXfU2+JMqZaWcU3nkP+Kn4fSk
+ioxFuH8db7fPB4ZD4wAK
+=wdhn
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild
index ba77a94ea881..ea8732f0686e 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild,v 1.1 2014/07/20 10:42:56 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.42.11.ebuild,v 1.2 2014/08/05 07:57:48 vapier Exp $
 
 EAPI="4"
 
@@ -36,6 +36,7 @@ src_prepare() {
 	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
 	epatch "${FILESDIR}"/${PN}-1.42.9-no-quota.patch
 	epatch "${FILESDIR}"/${PN}-1.42.10-fix-build-cflags.patch
+	epatch "${FILESDIR}"/${PN}-1.42.11-prototypes.patch
 	eautoreconf
 }
 
diff --git a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.11-prototypes.patch b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.11-prototypes.patch
new file mode 100644
index 000000000000..7aa309225b29
--- /dev/null
+++ b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.42.11-prototypes.patch
@@ -0,0 +1,50 @@
+From 8b90ab2b1cfa3974097b0466d8f7563323dda0c2 Mon Sep 17 00:00:00 2001
+From: Andreas Dilger <adilger@dilger.ca>
+Date: Fri, 25 Jul 2014 21:43:08 -0400
+Subject: [PATCH] build: fix unused/uninitialized variable warnings
+
+Fix a few warnings about unused and uninitialized variables.
+
+Also fix util/subst.c to include <sys/time.h> to avoid using
+undeclared functions gettimeofday() and futimes().
+
+Signed-off-by: Andreas Dilger <adilger@dilger.ca>
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+---
+ debugfs/debugfs.c        | 3 ---
+ e2fsck/pass5.c           | 3 ---
+ lib/ext2fs/blkmap64_rb.c | 2 +-
+ lib/quota/mkquota.c      | 1 -
+ misc/mk_hugefiles.c      | 2 +-
+ util/subst.c             | 3 +++
+ 6 files changed, 5 insertions(+), 9 deletions(-)
+
+diff --git a/lib/quota/mkquota.c b/lib/quota/mkquota.c
+index 58803d0..0ece088 100644
+--- a/lib/quota/mkquota.c
++++ b/lib/quota/mkquota.c
+@@ -580,7 +580,6 @@ out:
+ errcode_t quota_compare_and_update(quota_ctx_t qctx, int qtype,
+ 				   int *usage_inconsistent)
+ {
+-	ext2_filsys fs = qctx->fs;
+ 	struct quota_handle qh;
+ 	struct scan_dquots_data scan_data;
+ 	struct dquot *dq;
+diff --git a/util/subst.c b/util/subst.c
+index 6244831..36eaa94 100644
+--- a/util/subst.c
++++ b/util/subst.c
+@@ -14,6 +14,9 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <ctype.h>
++#ifdef HAVE_SYS_TIME_H
++#include <sys/time.h>
++#endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+-- 
+2.0.0
+