Revbump, apply patch to fix segfault issue (bug #465040). Remove old.

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 46 insertions, 11 deletions

diff --git a/media-gfx/sxiv/ChangeLog b/media-gfx/sxiv/ChangeLog
index 29fe54bd10b5..58f334b9eaac 100644
--- a/media-gfx/sxiv/ChangeLog
+++ b/media-gfx/sxiv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/sxiv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sxiv/ChangeLog,v 1.11 2013/04/01 23:24:40 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sxiv/ChangeLog,v 1.12 2013/04/08 07:57:06 radhermit Exp $
+
+*sxiv-1.1-r1 (08 Apr 2013)
+
+  08 Apr 2013; Tim Harder <radhermit@gentoo.org> -sxiv-1.1.ebuild,
+  +sxiv-1.1-r1.ebuild, +files/sxiv-1.1-fix-segfault.patch:
+  Revbump, apply patch to fix segfault issue (bug #465040). Remove old.
 
 *sxiv-1.1 (01 Apr 2013)
 
diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index b01bec1d4aca..5007c79f79d7 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -2,22 +2,23 @@
 Hash: SHA256
 
 AUX sxiv-1.0-makefile.patch 835 SHA256 ec5bfcf71e455f6ea23b1ff9d22dcf9363123e15b0b15795ce058e29fe400880 SHA512 c88d5b8886366df7939b0d2b1490060fc3254837b09bb2de23642a0517a2c406c01597fd2ed5d56a280e6f73037c4d0d9faac2f8936921de9fd03530a2ad1e86 WHIRLPOOL ba82b28ea96d4c87aaf13c81cc7389a4b3bc25ef319732cedf3f7fa6fcb757f8bcf24ce3d03c3cf98631ccc43b596798f925fddeea6a4c01fed3ea4ab7b72034
+AUX sxiv-1.1-fix-segfault.patch 688 SHA256 dd98c29008e9aead1487c34cb881ffaaa3a0b5edd835f7541366470f4b271803 SHA512 6dd6240cf98f8126691252ab18e5e8f80700819df64467796f2452d0e8d221bffca3608e9fb7cbcee2e311ba5b6607343c2010b409a54ab63463b32919e0a82a WHIRLPOOL 8624db53d400fd046d96e01a57dc9bb4bb7260747a59245cc02c4b2745d5b10d412134c7ee1ea5fea7076bd07bbb855c5636ee824ef10d117eb9732d05c73427
 AUX sxiv-1.1-makefile.patch 411 SHA256 3b28f7fcc10feb90149ec3f4928cb4820808e04a001b71b360d04aea36fef813 SHA512 44957d1ccb101314df8f3bfe3bcfc96e06aabdf9fcef926277ea88ec8ccc6f0fad148763ff649ac3f5c050004ec57366d3cfd4f48293d79c148dfc3fe20f7514 WHIRLPOOL a86a4b50dec87bb33eaa9d385bd0e0b71209d1b7f3a4a8b031a884430d0f9c804b785d8a9daa0bd6150e017236a70b33ada3defebddaf7fc0bad4d4a80bf0968
 DIST sxiv-1.0.tar.gz 33568 SHA256 fa49189d7bc139bd3dc50aa4e939fe4480c524117ed89dba7a3f54da5013885f SHA512 c826f7612aacae277c819976f2888b7248788b5262b267797fb2c18bcc6d8216324bb3ecad7f9badc5afcfaf4ee44e2d0dc3e8bf8932758aaebcdd824243c0a3 WHIRLPOOL dc08076afa91fd38bb621f60df2fbf13e465b51be03bfde2398999b77f2b1acafcf22ae431377676b622bbc6406dc2eddc6634769f46715fa767c26ea23c59e8
 DIST sxiv-1.1.tar.gz 37172 SHA256 7d22b060d264be25ee0e95afff9df535299dbdd48067c9fc795133e583e2583f SHA512 731ad9aea4775503684b469e5e34f0c36a058c316ac91c7f5b6d28ee48b66715a7bdf986c3f89647cff7ac715bd8d508419c0f3b5cfdc887a6649b42c407584f WHIRLPOOL f7f65e74c2acd78d5a9bac4e8524930e5ec1d7a8ee0cbbee775d017113f18d46d904b77e4976d223fbaa5e7d237e206e8048d940dd493632c2fbba9893eec4dd
 EBUILD sxiv-1.0-r1.ebuild 757 SHA256 ccdd5683e10d7c1087547ef2a75649c0770161e212a8166bcaf6a54ecbf9c8bf SHA512 9a1041782ffa292303a40921c00bfcb4b0231fd5092e9b124f19eb188457d2da7f0db3a59a5c1494f6542ebb54a5097a043dc4a1fcabd2bfa66af8b3eed43e23 WHIRLPOOL a8c40afa633f26566a5e7affe41ff59fbb1473700c4a50939a31a2dcf632ed54eaa5645743b8dd2ed57fb43bf1dde78b511b82827c6449ab34a3ed5e01bdb46d
 EBUILD sxiv-1.0.ebuild 825 SHA256 bdba88410dc9f6534983444bb49334128247dfea2ce014488b8c8b261063050a SHA512 78c4183424058fcb2627beb9ecb771d92943310faf28082da1a636b4bb908f26b7c91941e280e5af69b52e0b796a631acd065619871554b10a768c31981ae351 WHIRLPOOL 2328dd8c9aebcce78ca1faf4d16fdb2d915c1dbb3ea16aa6d1a3161a8505bd3877c0d14fd58eb4b5bd240ed292cbae4ea051779d06efc1e2d1b401efbfd2be86
-EBUILD sxiv-1.1.ebuild 791 SHA256 0c16c576a033fd6d96025d5c3834ad15d3499385557f22e1ccedcaf0a4d6c24a SHA512 74d1f49dafcda6013c1bb12441c5cb5a9b713bd96d66dade1b90cd4c3f76e6d13e43abe6cbca0d6b732bc7c132959ace963a6b311b21ad7c12069792e61c9d4d WHIRLPOOL 4430e029acb6f4eb6573b4281dad7c7ef8a83ceb7382644395ddda5b4031896b89404025c0af54fbc9b3bae8c841c233b66a99998e3097c24649ce69d5dc4772
-MISC ChangeLog 1629 SHA256 1e9a5707cb2b59f70a43ecf95e70efddedb4ea315382c643d74f89330db9859e SHA512 7d529c96b20a8e1d7979b0d8fc54d1ff43bf60161286503cc00af96e4acb5ec2c0b33916e94fe4f4cd8abb0313c0dd597b8f88e2fc6f708eb70aa4e0859683fe WHIRLPOOL b5e72db966bbb5b993313d031ca13930ddf04afe02e4f35c7101a5c5a090e6fbce65a1607b52e0ed59edf2ec32b43b4068e6aa7fedbfadb6287558141c2ff610
+EBUILD sxiv-1.1-r1.ebuild 845 SHA256 1f1c8e65e8ce5eb0269173b15b887cc28121cc8c56fa5ad2b0431e72725b1635 SHA512 d01ac9ed8712a2b3dbcac7961db0eb681f708c199d4924d6d4b1dc923726a65baebff99ebb9c49a058771a9f4dadcd0797ca281c7cfeb61d0447f31a39f1fc34 WHIRLPOOL f183fd8d410bebedc3abe69a69bc8dde11bb490d4ac249736239a3eded11fafc70b3008ee540e835a8fb4ad856bbd3e5b831b678a9128b0b07d98b9420b8e2c2
+MISC ChangeLog 1856 SHA256 7a4270df91a891be0499f5bf60a48ce9f3bcece14ef788eeca2568133dc6ea7e SHA512 d908b5dcc2a5609f46f32e40a816b064a8c4d8b18b3ad2827b61857add47aaac76c9a5f196879ab831cc49f84a3daae0aca60c1467533d73f619219535899f7c WHIRLPOOL f373e2463906f06e96c9fdc09edf8eebed2936b5fb3a620a99b3946b3e84af379ba11a9a50e51275c51471357bc0242f349f095d4f1663210b9077aefb9ee470
 MISC metadata.xml 163 SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564 SHA512 ff4552bc5fce771795ba67e190fc9eb90ac70aaff219130e7ff9a36cde348cd4a771d8b61e158ce9390771d29e2e0ffe17618746ff1843b2af7322e0f21cdf2c WHIRLPOOL b0db778b8dab215f2790081db3d51586e43bbc790ab06f704ef4ddd6e83e90e53685d3483feff33ed1763945fca36e934e7813bff822713869d0d7f208678fb1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRWhc9AAoJEEqz6FtPBkyjsBEIAIvY4l7t6JbiLgesctv2I90Q
-M5k+Nt/mm1np84utnVpEcgUURfOzSVG5VSgmBj+lZ20TZp2GRAKBwUxFVQF6E9kH
-yl/fKGH2zO6fkZbgijSX7RRZ2bBxtdvVnS29XFrRhVfPVDHrnLisqzbbg82R4DpM
-a7Oc1ub/EcTOIMO9y/9H/BQ5PkiA5H/odJ7fLEM9kjuyDQqZNINJEdpWjpc8fxZQ
-c8g02tVgZWDsDCWyZVLLoHHBpjeLtMFVinDHk7VEV2PsVTlt+y6SrDUBmbqoPYVj
-kFvk3mI0J/I19xdB25m94FHZRIcWZvXGjkRVB9k6SOUxLRe9rwcS3qZsNNAOtgc=
-=Qj0c
+iQEcBAEBCAAGBQJRYnhVAAoJEEqz6FtPBkyjRrkH/iec8rn4PFpltFbJvhqK0L6P
+QKVkzC7aedt8k3wC6caXnW7zfolmLCxQnU9Oiozm1018i1j4nI5Bon5fe49aCRoJ
+afsM6DlyTtuC70LTbUYH09YJlquX9V9fqTs4ZT501o0QfBk4AF5AEDLqw5qmlOIl
+dcB4PAcVFXo41lZantIbz9Fb8+7LKamPUdgY8tuMfPuO8LlMOPu7c3ADVmyzzgNC
+eqJCIclrv1XA23q7MNTAsxY/ZX8g6iefIzkaWCxUvaEnlx5s9tKPZ0/J56fm6KlA
+F2rb1vX4+03ho5N2+IxlN5bvUFqhj+iz8be24GaEfZFF6gYLUapyPo/yrCDeXuM=
+=xpDD
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/sxiv/files/sxiv-1.1-fix-segfault.patch b/media-gfx/sxiv/files/sxiv-1.1-fix-segfault.patch
new file mode 100644
index 000000000000..00e238b995df
--- /dev/null
+++ b/media-gfx/sxiv/files/sxiv-1.1-fix-segfault.patch
@@ -0,0 +1,27 @@
+From 98972e98f942fa3d3cd2b8f6a831da0a1f94551f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bert=20M=C3=BCnnich?= <be.muennich@gmail.com>
+Date: Tue, 2 Apr 2013 19:32:59 +0200
+Subject: [PATCH] Fixed segfault caused by FD_ISSET() on negative fd
+
+Reported by Kris Siwiec
+---
+ Makefile | 2 +-
+ main.c   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/main.c b/main.c
+index cda0c4d..4962782 100644
+--- a/main.c
++++ b/main.c
+@@ -536,7 +536,7 @@ void run(void)
+ 				xfd = MAX(xfd, info.fd);
+ 			}
+ 			select(xfd + 1, &fds, 0, 0, to_set ? &timeout : NULL);
+-			if (FD_ISSET(info.fd, &fds))
++			if (info.fd != -1 && FD_ISSET(info.fd, &fds))
+ 				read_info();
+ 		}
+ 
+-- 
+1.8.1.5
+
diff --git a/media-gfx/sxiv/sxiv-1.1.ebuild b/media-gfx/sxiv/sxiv-1.1-r1.ebuild
index 1830f8da8cf9..47158f83c036 100644
--- a/media-gfx/sxiv/sxiv-1.1.ebuild
+++ b/media-gfx/sxiv/sxiv-1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sxiv/sxiv-1.1.ebuild,v 1.1 2013/04/01 23:24:40 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sxiv/sxiv-1.1-r1.ebuild,v 1.1 2013/04/08 07:57:06 radhermit Exp $
 
 EAPI=5
 
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${PN}-1.1-fix-segfault.patch
 	tc-export CC
 
 	restore_config config.h