Add fix from upstream and update libcom_err/libss sed line.

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

4 files changed, 143 insertions, 19 deletions

diff --git a/sys-fs/e2fsprogs/ChangeLog b/sys-fs/e2fsprogs/ChangeLog
index a3c09d54b9f7..f23a7be4e6f5 100644
--- a/sys-fs/e2fsprogs/ChangeLog
+++ b/sys-fs/e2fsprogs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/e2fsprogs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.289 2014/08/05 07:47:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/ChangeLog,v 1.290 2014/08/05 09:01:52 vapier Exp $
+
+  05 Aug 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/e2fsprogs-1.42.11-prototypes.patch, e2fsprogs-1.42.11.ebuild:
+  Add fix from upstream and update libcom_err/libss sed line.
 
   05 Aug 2014; Mike Frysinger <vapier@gentoo.org> e2fsprogs-1.42.10.ebuild,
   e2fsprogs-1.42.11.ebuild:
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 89cdb10af965..47bffb7fdc5f 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -12,6 +12,7 @@ AUX e2fsprogs-1.41.5-makefile.patch 3253 SHA256 7d2d075a475e47d90dd181fdaaf6554b
 AUX e2fsprogs-1.41.8-makefile.patch 317 SHA256 f8a4e2180f557c3bb9a50c38300e406420b3df296f50d6eab59d0b28cb65904d SHA512 dbd738affe910d3812ca4d969a6d4295b09abc413cab23f29dcbd0c1e82eefa095a61a377c494dd9b7e1d189d4edadc469dbf2d1a1068c11dd5fc8311bd83f8f WHIRLPOOL f81ecb87217bb312bbbb08357f76b2d5d7c2dc9cdee69d37e67e7b34632f4a3f3d2bab66aa600fa98776808b30cada735de05135ac60a5c2f9b59daf88b7eb53
 AUX e2fsprogs-1.42.10-e2fsck-fix-makefile-dependency.patch 1285 SHA256 a1090094da6b858d51d7a8d2d03ec96b97468672785a824cef774c5d0090da30 SHA512 a892e92fbe1e1238b72cd5b53d9825c5bd2116aeb0b1fb9eb60a14bc984a16b65624265d108ffc0f9e638a773b655999eb3ec0056c46084b4291ff639a3c72ef WHIRLPOOL 20d7b4d36774e4bfd52f37d06b98fb13245a820e4d9bac54e33846e90451a94aa510d08649e035791a9ca301fc883043415eb8e4726cb21653c29a20e38003b8
 AUX e2fsprogs-1.42.10-fix-build-cflags.patch 370 SHA256 11871291de4605c6a469327e698e51a611c786451ef3ecedf20bcdef75c9e50a SHA512 a268390656dbc6ff5217efce5d38686de70de8d2c566b117a53c42fd829178ab07f300e10017623dc3931084214ded620e05500992ff8371d47c2d90764f58b7 WHIRLPOOL be6a71d843a1f9250e0fcb4ffc7ac0d4c2eb5e56749bbb9fa4da6eed181270c3cff2a36241738beb959959bb9de8ceba079cbdde844f16d5e302c4ab84eb2e71
+AUX e2fsprogs-1.42.11-prototypes.patch 3473 SHA256 bb4f0bf7be6b28c8be5162ee311ca9eaf6e9ec4d204c458e3543c22c4f2c2958 SHA512 6d44ddf4677d056113ef25515c8fbba65447df61354c0c02cfc3f86979a798f7ab9a41182a04feb86eaf48a31add4dddf0663dc2ac2c637a6f91f4f9808d82ca WHIRLPOOL 3cf51c8099bcb444e35ec6500efeeb17a9eae5b893bc01359f722f3d9645a6dec1676696e594819b72a0e2c4208b1a2c6b9b6b9b147383fdb7a057927eb9c79d
 AUX e2fsprogs-1.42.7-libext2fs-fix-return-value.patch 1082 SHA256 8cabc57993ef8c03636a645c1415db7ed0e56a24cca261dae2aec5be91940940 SHA512 f2874dcccfdbd4604b178920e839fe66d63a5d3f433d5bacf0ccfbbcbc0c64eced2a861c7e024fcfaf86d15f6ef6e12edeb27af1b4eb8670ad0b9281e563e472 WHIRLPOOL c74b28d1351c8309398704a22c4dec167a3a9569da293e04198171eba637e846e8f3a3073d571ffc2f985e4ee23ad03a48ed55c3f6da7d20cd063187ae9ab05c
 AUX fsck_ext2fs.8 3806 SHA256 fc1155e67f17aebc8762d75a25d25511a1463be3da05baf7a322d0b5f91938e0 SHA512 eacd1968267f320587e01f75a66ceaa5a9b899f368686df893b6335c25ce8f304ebb5852df6f1b22a125642720ab110fc3b0878bc3560c628e8beb3a4583ef08 WHIRLPOOL e8343c2ae959075b043998894486fa5a33d36e339e511ae22102b60c2c482900d73f3322dd2b8daf91b5009b3da0639aa192d3ff1183d31db748a1143af97a94
 AUX fsck_ext2fs.c 2797 SHA256 a7c3614e76c89ab7882191c14a469789d4b5b54f3c61c5888e5bd72840816e22 SHA512 525c88a3dd9178ef2dca056db9226a2bebf537b9a333cce32f2ef82d6d7a6a56a59dfc2ebf9aa3e891d9690fde13588cf619f89d6b806405810de5dcfcf08040 WHIRLPOOL d71a13f80694a39ae2faf4fafaaf0ce342a0963ca2fb5b4bce279c9a9816139fedeefb5a3c565b6c6829a237e39b7e4dcab54aacea8b72fc3f1ab0122c667ab0
@@ -22,24 +23,24 @@ DIST e2fsprogs-1.42.7.tar.gz 5981006 SHA256 dc6501b2e75d205e425196d753d92b129c56
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 SHA256 3904654080b7f7776e97b703d17e1b59ae1d6f5e0cf32193b86e986bc0a9b396 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc WHIRLPOOL ae6fc015fa77bfbde7a4ba2205c014b655e736c4ed5cb63a913245c6c40fa0637b65fa3eec6399dd1793c494892b76e0bbc12ffa6ac9c39d4da27333d8bbf6c7
 EBUILD e2fsprogs-1.41.7-r1.ebuild 4157 SHA256 8bf16f0634e1fa357fc2235f22c619328c10f8d37ba22d75889ab6a1309c5a14 SHA512 cad0f30208422b49221dca0c8c31287f011b2f7a992efa265a53220f6304e0f81f5214ca03e3b885963462f5618257662f68c73b342fe9bfe4d2c27aff1722b6 WHIRLPOOL 8ea704eb90382e405092fb03564b9a947be0139d4dd09974d1838e1525c5cb5ecb976a3789c6a73eb83f3c817731ee7d5fa9d8435024109580307749a1cbc83a
 EBUILD e2fsprogs-1.42.10.ebuild 3656 SHA256 855853154d28c2c91e8dd47ac92ec339d2721ddcfcd29593792aa097c59fe5da SHA512 b3ae16ced0632744cf991fedc47afb5899d0d786414e7b5c5252f19c28e2345854ec932601c38aa894ef865d51657bc8eeb63b202c67966344dd2200e529635e WHIRLPOOL 86ffb509fd00953054bb136df5a1d8c1d9851962f0185fae6a5fad03c62dfb6c17298522e08bd38574680c0eaedc19e93eef2ed8d1073215c9f54bd02de777e6
-EBUILD e2fsprogs-1.42.11.ebuild 3773 SHA256 abdc84da315958b0e768500ac5b1fefd4a19cced3e8455c01b907248931e86c3 SHA512 f893c85368e448a3622779bf97d40413e258c5190bd77e1244b4bb836fa1f51b9e3c091c753ea866eeb43438f3ef7b01d3ad93e4e11e15a7039bf387f052c992 WHIRLPOOL f9e08ef38849234b60da0e366eb39dba6fb584a5ad9cf05ff1ebe3c33f6ddd139fa8350f967f9ce55c431c3046cbc9be8f5329fd5435581fbadf24eb0df93f82
+EBUILD e2fsprogs-1.42.11.ebuild 3856 SHA256 92367a433077dbebd865b772123f3a4763660f6232ee96c15ac6377a6b877758 SHA512 bcf64b085cae51eca6766ad0663e3bc6932cb1921fc391e2bff2710a18e05b0c9b6b9e460d471e5cbf026f72b72d4704259ecb67431c6dccb5d14e219b86c7a9 WHIRLPOOL 40005286265245fd08109a95f8217a33c5a1848e9cd43b97c1a54233f62b26fd354df0cbbe4b3999c0c8dcdf0ae07d88c50d2da4863c8d429e4bd89e00cb2505
 EBUILD e2fsprogs-1.42.7.ebuild 4352 SHA256 3a94e1adf66909468588c7c9ad908abc5dbf7e0c70f8da277e7b1f0066c69d9d SHA512 97df9b66620fde3242968e507da4e9d05ceb878abe7d01291d7198eec481c8e7a60869dde11b595d0d392bd5184e9b336fd1f831aaa563452ea9a98ebe6e4a8e WHIRLPOOL af0744c81d58e4392011266776839d9def671cdd8943ab74cd2e99f2f551a3924d0cf4b50d4163d7ce592582269128b3945516e8cb3551473220849dfc73e471
-MISC ChangeLog 43375 SHA256 41630d7f82642da530c3f822bda7faf44cf9d605aa648c7dcdd677d639343659 SHA512 5c73e37b2eba48712f5000266c66da949fcb2c87c2fa3cdda29d846ee0e1312164078405f446038b4e0c786c14b2e76a744c3cdea4e181feb0b6b60da73921fd WHIRLPOOL 391239876dbc9aaefc8df359e58a5a22bf28773e887d367d753ce38f27ff623ec0ef73a6d1b16bb32d449acf129a3895747269597d3f41267de5e2306390ea03
+MISC ChangeLog 43559 SHA256 923029a0ff016b9a86e0d43e9dfb21b8f1a513d63193438c7fca9e4e73eb837f SHA512 9dee42cddcb5af8e72858d78ae14691a5a19b6578085ab79842a8a200d9244ff7530d73c7db6a26922eaad7442456e99a062d06647a576442923e2bd0591f766 WHIRLPOOL 986c30d0f3e097499fb1f8d937694bd8b2b7a390da0c173a97278dd4e3c100a988122c9db4352516e111fca002ed759e6f82f0d4ed84d391a90255155b7b49fe
 MISC metadata.xml 267 SHA256 b88609559861f59092d42a34388b78e59a1eeae8324a6f79c94fd24598c2b5a3 SHA512 979da7eb8495724d938e6445cc7878b2b484373e750a82a48cdf11b6e46257a1c1ab1cd85b08b854789ffcea5c54120cc5aaabd2f830cce2b2d0bea9de7011ee WHIRLPOOL b671ec8a7c10856e977c7cbb5b7d55b8463f0cf86ded627d9407e1099e376d6381c1a23ec5aabae788419db3187b6737f008ea7c6f2ed714c8dce2d773b8df4a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT4IwYAAoJEPGu1DbS6WIAFy4P/A+fUIsTT0j/XCCA5GJxx8I8
-jCwk+S6gcesTD84jPr3l9WG44s42E5GzbXr2ZMYXVoliJCYzEA0Vjbs0Z7hdigFc
-QpgLccz3n4YNrPYyToTIJ7MPc8vsgi9QAeUM7FqDHWyBFONG5oFDbTn4IIPmwdWP
-YJdPVCEpuhZE7samqZIRpzuE4+HUFN5xdt0q/CmnoKUv3Fh9+pOWSiB+VRxilikz
-6Ck1FH6/vPX42EcCLpxObCDRyhHQ9uIRvwMt+uAYYBqapkRpC/68xNwyB8YtAAhk
-wgApLoOIFBoYItmWNlWJ/kHsybKODRQFDQEWugRr8VxhYavaTDb8I1yzokz3Mm+c
-WPz+4pp7cL12V10LZLDECTJEcEmWnqSR0+O/s25mKzSJygkIu4Mo3+uVJRb6JaF1
-3lNQIEQmw1zrSrI3dIHrtb/ra/sopEXATxEG9702gCLcxMRRYzIbUV8Shw52+vId
-3At9z0GoaUkEgmm9qWjvaxJa8e7+YUAPQhpsi31mHwh80HD2SIupCvVqGofh6olt
-fG3VxXHX46AOpFrZlYMuwzTogjpLaza3Qw6+jaw+ZVef503b7j1REU/XtKILAEUt
-4r6PJGv+EJ2ARW6ZPsJp2+3L/rbdvmW0ZC8HeHkNJIQiehXs7vbBnjJzfXPBSEyq
-vJV5xO5KJSi97cP0dp+2
-=R9sC
+iQIcBAEBCAAGBQJT4J2CAAoJEPGu1DbS6WIAUucP+gPR/bktx4eWQ4f8E1M8MqKZ
+Un6cu1aN/c4AmWtkG03edYSBKVdsumRfZbFkGN3fKpLGqjDN2FeuPgld5/QcSAU8
+v8lXRcwlMs7qAo9BipHl5LX0KXSzIWnBEH8sxq0uCkeebVG48ovvteOofuKh1B3+
+lAJW6w/kqbSXCsA6GjsOsAlF7rtCU5xdPwCqFDwh4WbmTkE99SP3fmrj2t2gTuMb
+UiECzrkbnioFHAMDvGEr+3HP5LJxTv9KNoobzO74PUteJFCNs8x+1eN8ENk9LBDC
+4GG7TapilbAan1d/mPh9fgyRtlztTLfVwXcte8njQZe5yabKhYTpIVSLhfpt+fEq
+MSZ+xWH7vdoMIKqWEFjGjQsufCpB8T+j+UQn6WpjsVYK0AyNZApIt+xIeNe/gG7z
+i/WYOrbnF2otWmlakABVpp1/kjIb4T3U/iFZgqvfvJPaXfZpvY/B9VNTC8vk+C5+
+Fl5JU9tKGsf96TYuAT4BZ5NwZJCEUVaEQUDr6LZdMBDgzhFY+H7VRcd5dVffB6bd
+S4Qsj9yQ3mt+WS8SLhmLiTq/p3Vqf5C21CqJD/eSw6Hz5O4uxFK8s96UCKOeFHnO
+IF5uYSURYEENFLHjjyS3KJUbSa64dbW2Kfa5groCjd90hK7C1DXYaAyh0vprPIjV
+U91Dgyhqf1cQGWb+kDqT
+=vwxc
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild
index 6ec80535a721..3e077f8e19ee 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-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-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild,v 1.3 2014/08/05 07:47:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/e2fsprogs/e2fsprogs-1.42.11.ebuild,v 1.4 2014/08/05 09:01:52 vapier Exp $
 
 EAPI=4
 
@@ -38,12 +38,13 @@ src_prepare() {
 		epatch "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch
 	fi
 	epatch "${FILESDIR}"/${PN}-1.42.10-fix-build-cflags.patch
+	epatch "${FILESDIR}"/${PN}-1.42.11-prototypes.patch
 	# blargh ... trick e2fsprogs into using e2fsprogs-libs
 	rm -rf doc
 	sed -i -r \
 		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@LIB_EXT@:-l\1:' \
-		-e '/^DEPLIB(COM_ERR|SS)/s:=.*:=:' \
+		-e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
+		-e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
 		MCONFIG.in || die "muck libs" #122368
 	sed -i -r \
 		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.42.11-prototypes.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.11-prototypes.patch
new file mode 100644
index 000000000000..45f10710fdb2
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.42.11-prototypes.patch
@@ -0,0 +1,118 @@
+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/debugfs/debugfs.c b/debugfs/debugfs.c
+index b41626c..b6ba1da 100644
+--- a/debugfs/debugfs.c
++++ b/debugfs/debugfs.c
+@@ -2347,7 +2347,6 @@ try_again:
+ 
+ void do_dump_mmp(int argc EXT2FS_ATTR((unused)), char *argv[])
+ {
+-	struct ext2_super_block *sb;
+ 	struct mmp_struct *mmp_s;
+ 	time_t t;
+ 	errcode_t retval = 0;
+@@ -2355,8 +2354,6 @@ void do_dump_mmp(int argc EXT2FS_ATTR((unused)), char *argv[])
+ 	if (check_fs_open(argv[0]))
+ 		return;
+ 
+-	sb  = current_fs->super;
+-
+ 	if (current_fs->mmp_buf == NULL) {
+ 		retval = ext2fs_get_mem(current_fs->blocksize,
+ 					&current_fs->mmp_buf);
+diff --git a/e2fsck/pass5.c b/e2fsck/pass5.c
+index b31490f..d0b1ced 100644
+--- a/e2fsck/pass5.c
++++ b/e2fsck/pass5.c
+@@ -206,7 +206,6 @@ static void check_block_bitmaps(e2fsck_t ctx)
+ 	problem_t	problem, save_problem;
+ 	int		fixit, had_problem;
+ 	errcode_t	retval;
+-	int		csum_flag;
+ 	int	old_desc_blocks = 0;
+ 	int	count = 0;
+ 	int	cmp_block = 0;
+@@ -253,8 +252,6 @@ static void check_block_bitmaps(e2fsck_t ctx)
+ 		goto errout;
+ 	}
+ 
+-	csum_flag = EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
+-					       EXT4_FEATURE_RO_COMPAT_GDT_CSUM);
+ redo_counts:
+ 	had_problem = 0;
+ 	save_problem = 0;
+diff --git a/lib/ext2fs/blkmap64_rb.c b/lib/ext2fs/blkmap64_rb.c
+index 4dcb03f..a1dde6d 100644
+--- a/lib/ext2fs/blkmap64_rb.c
++++ b/lib/ext2fs/blkmap64_rb.c
+@@ -83,7 +83,7 @@ static void print_tree(struct rb_root *root)
+ 
+ static void check_tree(struct rb_root *root, const char *msg)
+ {
+-	struct rb_node *new_node, *node, *next;
++	struct rb_node *node;
+ 	struct bmap_rb_extent *ext, *old = NULL;
+ 
+ 	for (node = ext2fs_rb_first(root); node;
+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/misc/mk_hugefiles.c b/misc/mk_hugefiles.c
+index 6bc25e6..7f1be2e 100644
+--- a/misc/mk_hugefiles.c
++++ b/misc/mk_hugefiles.c
+@@ -468,7 +468,7 @@ errcode_t mk_hugefiles(ext2_filsys fs, const char *device_name)
+ 	unsigned long	i;
+ 	ext2_ino_t	dir;
+ 	errcode_t	retval;
+-	blk64_t		fs_blocks, part_offset;
++	blk64_t		fs_blocks, part_offset = 0;
+ 	unsigned long	align;
+ 	int		d, dsize;
+ 	char		*t;
+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
+