Fix immediate segfault (updated libassuan2 patch from Fedora 15, thanks Kevin Kofler!)

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

3 files changed, 82 insertions, 16 deletions

diff --git a/kde-base/kleopatra/ChangeLog b/kde-base/kleopatra/ChangeLog
index e643ec2227df..6200c90e66f2 100644
--- a/kde-base/kleopatra/ChangeLog
+++ b/kde-base/kleopatra/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kleopatra
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/ChangeLog,v 1.151 2013/04/06 00:04:43 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/ChangeLog,v 1.152 2013/04/20 01:20:27 dilfridge Exp $
+
+*kleopatra-4.4.11.1-r1 (20 Apr 2013)
+
+  20 Apr 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kleopatra-4.4.11.1-r1.ebuild:
+  Fix immediate segfault (updated libassuan2 patch from Fedora 15, thanks Kevin
+  Kofler!)
 
 *kleopatra-4.10.2 (05 Apr 2013)
 
diff --git a/kde-base/kleopatra/Manifest b/kde-base/kleopatra/Manifest
index fd3b84e51691..598e480b732d 100644
--- a/kde-base/kleopatra/Manifest
+++ b/kde-base/kleopatra/Manifest
@@ -4,28 +4,30 @@ Hash: SHA256
 DIST kdepim-4.10.1.tar.xz 14032628 SHA256 7b06ceed9e964dbef9fb801406dd44126363069cc89cb3ceb30ae271ea94515a SHA512 689de1196d7be563220bf32e7cd14e47b696dcf2be5508741703adc44fe06f5f78bf7831a20a7544197228543783bd694e48ab1291cc61f6a5476ba00c85ec01 WHIRLPOOL f63d805bd7881550b655c12fcab4e1c4f31d70fda5372f57f7d890ee0d4ef9f7ab2752cc6fb90216b8d0de38ffb2041f8d631263afe609ef2ddc9f87e4162798
 DIST kdepim-4.10.2.tar.xz 14109052 SHA256 93f2994e947bfe178dc0bc1d6d43eb8515d513bab022c74ed7435035dc030393 SHA512 0fdee0656a43553af61b545f0aaa6bd57ea472c466f6dd05e44919bd59d3c3003b4f4ff068732d107fd202ceaf5a48a1fa85141e83b6aac3a1910ec1910f6bd4 WHIRLPOOL c763592df4d7ca6bb45b4e4204d2160ce2264493749656eac933268b59c03454eea847e7c910f925b9e76cbd6d85af708819772fa28d8215288e841500e8da1d
 DIST kdepim-4.4.11.1.tar.bz2 8964708 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf SHA512 7450ba9985c5583847d1fc3d214940cef130150a3591c3cbb73bc15624ee0298805d5dc25f3cd3a135091c1d0491b865961d52aa8feef623219eed9364dd86bf WHIRLPOOL 349a72c5c6859c7cafb1aefdf80b80482102c8b1d6e0123c6c410d262c3908b9572daa1950e2fb41e6bc727430fc91bb57b7276e345553ed15d792fa63aba5ec
+DIST kleopatra-4.4.11.1-libassuan2.patch.bz2 9404 SHA256 83d6930917e59450690394ee948b30fe138d631928d4afffc8be25d1a41e75c2 SHA512 4f514e6dfbe89d777604485d3144ada9a600b1c3c031a732b34b0cb7533eadae545e67a2819e43fafd4b7ada84845c25e1f93b01b06fc169daf48734684893de WHIRLPOOL f749ee88b13a905138a0c63a5833c71470f77923125f6c93e09fd83d399edfd1497342112ef420c7823d570d8676666117b5f821f46ed0d1ad961c9497142252
 DIST kleopatra-4.4.3-assuan2.patch.bz2 9304 SHA256 eee3fb370a0f93bfbfc4c4386e74c026ab8fceba004eac3a1467721e31856c96 SHA512 59196f1d1eb301064305da5e9638814198d4cf30672d1e72a3cf7ba7085aa1d4cbc351f4c90d3d96bd2ba4a87876e044610ea3509d6b97a09b75c1cc9ea4cbed WHIRLPOOL 31309a8a08369c4121ddc0f0b43455b206f777d034f05190df24043dc65be7612f0b4ea3e3d903efcaeb3afdf5be06dc08976f5fd99c0a932331b53e090da308
 EBUILD kleopatra-4.10.1.ebuild 748 SHA256 c473d93ca381e9bfa72cedae7243c686dad3b299102ef723f3799d1513440ed4 SHA512 151748d5b7bc1b422f9875fe70ace17fe9f78235f1e73d5668f20145b09ea3f71873a2e04ea2057a9b522ea14ffb977220fcff16582560855c58f793cfbc3850 WHIRLPOOL 71e1571ed44dc6aacfdd18aa76f3710ab777e36d9996d6771db7f615e2cc68f17194e735edbd4e871a41dfd011685f97f78ddc9346a3358938c5392803660b95
 EBUILD kleopatra-4.10.2.ebuild 758 SHA256 e28e522818223f9e3eed24085ab7a8e560c0dfa8ea99faed37861c90d6fe5adb SHA512 26b6578768de3eca31a6a19a4594b5e7e9ca048cd6022dc343e7d5f60c0e15604d3ebd6173c03c380b54870c656982ef7b97c6ae5570ee9baf621628d060049e WHIRLPOOL 04ab3db9095ecd0ab155b9e84e73848e521b5b77006a153717d6c088cc196ef42422530983aeaa75321206a733cca3ca15c79c073a857283cc61dff4dd44c16f
+EBUILD kleopatra-4.4.11.1-r1.ebuild 1044 SHA256 246c4db2b32796d658d2ad378661513c084eead7a7be49fe6248ecc44cb71a95 SHA512 4282b42a4f955d8962b2836445da27f4f064fbd3c63ba308cb53c88692653267107e4f8d9d3676ccb2e42152c1d8fec4bdafa659fc143f09a604d5d5dcdaad07 WHIRLPOOL 62c38176f2aa9dd67099564f059c35d74890dbf507f45cbb6946c691a42020deaf7d644f947f755572e19d1813edec30ad6859780c2c9f8c59be54159f7d6852
 EBUILD kleopatra-4.4.11.1.ebuild 1026 SHA256 02087790b628f2fe8d9b366c8076fa3fe1145b033022308c27e6e9d0dd67b8a8 SHA512 477159bc655e0c38883955b5c1fa12d1701ad2a9ee775429d5221a00a011a421eee1b8ed3a4505c164537878056c6f9b2f777d5347ec5ada4028dbbeca88a9c2 WHIRLPOOL 3c48866fd5dd3da601e023fdfb3fc986c33033bb4a77973dfc77b1be3404cfc7db0fea4aec06afd3463f2a1f9241e37846c65276d86eb89010dd9c6e69778e24
-MISC ChangeLog 18586 SHA256 04e6a6d2f6e594d79a98b3360e8c7ba32e1fc98d1b84765fd9d4bb8114d7a2a7 SHA512 80ffc3c48ba7b2631e4eac540e67346cdac88df9ae1b87aa17b87a5e39994da3d7d05f14ce4d6ca021da09e15e96309bff059debac813ad57cba72b3ad7da0de WHIRLPOOL 11fb053f0e911fac5918316d4dc92746ec683f142501c0698fe20d0be15a93b61f65661403085f56142c8899051623789c5205ae6b3b11ba67e46a5c728d930e
+MISC ChangeLog 18806 SHA256 8056303cbc106e344c5540da231a6f98394ea80a42de3271b5a3901e04b17800 SHA512 3960ef20ff438124ce9c5703e7210c5a83ff17995c1b0ab4d38e14e88a1239108978ab4c6b378cddcd6615ff5f31d3b56fbd6b05669b71aa6bb7270373d819e3 WHIRLPOOL e2d90bdb35808b78040cad05203a447c58477d5f9a9402d5ba1db0a5ed670860438a8f236ec3b9d2a0f94cbecceda01f9b42dd8ec744a02f51b8a03169900249
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRX2dHXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJRce2nXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOciz0P/0K0/DWnUit2sK92QUp2fWBP
-RGF3F0vxqVKt7GqW6hRyddXWSDdkdBqgJJvfXrIduQ6DKfYKHkBU1SGsYfFKmqan
-bauGsPRRPXQzJP2Aje49ROgW9rq6Q4KfwGvNGd6saPxlFQcGUU3WYmvU+unqqrwl
-5FjgOzxiZ7bhvSgWMq8XxzRew6CHGf6BVUNFlhZbFaXkUf7f3i+OKLNnBXDoOzIR
-6IMln5xkAN0G1FUlG1uSa/uDIF8hBggDuiNDZN/2TaN7QOkU7KNoVIkrBRkolv4u
-n+UYoUEAoaBSBnpnJY8bbYyu6iU41UTJMyAzGh+coNkfrgmb6vNwEB9pebFXPdxv
-H+W86t7Bi06txI1QKXYRABKbjzM6GAx1Tr+nR2JiTOiTNk3cgd5Wxmcn7ZA/O5Ui
-oHHKMKzUPR4vRFTydh3Qudhtbp9ffWxJ5LeT85O91ACQzO4kceW3A7Q9UcY+3+jI
-1AkrG3r5WLy4KCQ8HcYFgJxkKopV8Dmukai3erbzOB8B0VebQ89dInk2sDswn459
-kfdx9zgXzie9bFgtBziI/+vjaubVrFYfnrP0+V7tDcdzyroRsYhrVuH6tDYRjtrH
-yQQejVYXnFYlZmO/OY44fh6FiO7il5JA9rLGk7fyMf77YpO43XRbq5rPCiJzXGE8
-IWIApdRNhCXlptBwKBNo
-=IT3N
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcRSIP/iawauUKX4VpgGuwoOJuAXoc
+g4gBOuaQD8KS0GObD+MPJJ9Kewj9hc3k1iafRk/a2+rZFZj4KsDSBfFmzbxpWlWM
+9HjI74wJO+hXYdu/6YV5U4z1PqYQZhyZIm6WtgbyG0apyGLKPpWf13CYyFf4nimg
+XBivPqTaamJu+nCtSUMdBp4RGu6SNGjwyrWt0r9R+MGcwzsLEICAyIG9UakCNsJw
+lOmYa7a3XzcWPG7cChoNazqJ3TuoB91D70ukVKwTM5/sD9FZ6CrAHzv9LYsKCJ/y
+akbk6SPtW8KI5YoKCIZkX7jEgv2cvh40QpvBmhb7E42iPkC1PYOCualxmU/22142
+W+YA4qiKV6G2BoxbVgX43ssNAHj+XtPaJXkpUBSwGuUGL6EV4+DebldWYvEh+qMJ
+sgq3ykFn/4cv+oAcvZh1Eql0M/MQKbwT0gNhOiTWANwaKxJB+jcweNrOPstnpD3R
+TgWFLuOD6ej6K0XBJphCRV+zUk82vmnl7OwaQa2iUpSNSnK+de0l9S+tdhqahK3X
+yeRIfe4wxj1+WBEgBFobBAnwzwZgeMfsr5OufFNxUm975feYp3o8a0i6cMBFQ52o
+urx3w47RwQZl29ap36RamPFJHmTN0N7bq+kA/N3zyioSGO7gYevqlFZaTRPZLg46
+EChK0zqt42Ob9xHrxugd
+=sWCO
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kleopatra/kleopatra-4.4.11.1-r1.ebuild b/kde-base/kleopatra/kleopatra-4.4.11.1-r1.ebuild
new file mode 100644
index 000000000000..1374328d199d
--- /dev/null
+++ b/kde-base/kleopatra/kleopatra-4.4.11.1-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kleopatra/kleopatra-4.4.11.1-r1.ebuild,v 1.1 2013/04/20 01:20:27 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kdepim"
+KDE_HANDBOOK=optional
+inherit kde4-meta
+
+DESCRIPTION="Kleopatra - KDE X.509 key manager"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+SRC_URI+=" http://dev.gentoo.org/~dilfridge/distfiles/${PN}-4.4.11.1-libassuan2.patch.bz2"
+
+DEPEND="
+	app-crypt/gpgme
+	>=dev-libs/libassuan-2.0.0
+	dev-libs/libgpg-error
+	$(add_kdebase_dep kdepimlibs '' 4.6)
+	$(add_kdebase_dep libkdepim)
+	$(add_kdebase_dep libkleo)
+"
+RDEPEND="${DEPEND}
+	app-crypt/gnupg
+"
+
+RESTRICT=test
+# bug 399431
+
+KMEXTRACTONLY="
+	libkleo
+"
+KMLOADLIBS="libkleo"
+
+PATCHES=(
+	"${DISTDIR}/${PN}-4.4.11.1-libassuan2.patch.bz2"
+)
+
+src_unpack() {
+	if use handbook; then
+		KMEXTRA="
+			doc/kwatchgnupg
+		"
+	fi
+
+	kde4-meta_src_unpack
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DWITH_QGPGME=ON
+	)
+
+	kde4-meta_src_configure
+}