warn-error A is set for development versions (tagged with +) upstream, however it is not intended to actually be fatal errors for released versions. We want to keep EdDSA support, i.e it is actually one commit past 1.1.5, so just disabling making warnings fatal.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x250B7AFED6379D85!

4 files changed, 49 insertions, 11 deletions

diff --git a/net-misc/sks/ChangeLog b/net-misc/sks/ChangeLog
index 45ee700ffb14..ca4873665391 100644
--- a/net-misc/sks/ChangeLog
+++ b/net-misc/sks/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/sks
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/ChangeLog,v 1.12 2015/02/02 23:18:26 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/ChangeLog,v 1.13 2015/07/26 19:32:50 k_f Exp $
+
+  26 Jul 2015; Kristian Fiskerstrand <k_f@gentoo.org>
+  +files/sks-1.1.5-disable-warn-error-a.patch, sks-1.1.5-r1.ebuild:
+  warn-error A is set for development versions (tagged with +) upstream, however
+  it is not intended to actually be fatal errors for released versions. We want
+  to keep EdDSA support, i.e it is actually one commit past 1.1.5, so just
+  disabling making warnings fatal.
 
 *sks-1.1.5-r1 (02 Feb 2015)
 
diff --git a/net-misc/sks/Manifest b/net-misc/sks/Manifest
index 4931be58b33e..cd5510c7ab3c 100644
--- a/net-misc/sks/Manifest
+++ b/net-misc/sks/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX sks-1.1.5-disable-warn-error-a.patch 847 SHA256 0921dc0b9bfeac4a2628c88186969a1e44c1728085c69b3dc5584bb794bcdcb6 SHA512 a9c125e1a0bb7e60eacc88a39e9d29d0c58cd0999982dddb2f7f6af02b4780ae632bf5e5148339cb0ed83196d4fe9e9b02351700500a7141135eda03065b3679 WHIRLPOOL 16775dcbdc4ca4d14ab85ab995791c7380621530cb40d0aea7d22b4e392c3ac775885dbfd17b3c26b5915681c7a91703f016d875dcfefe5ed04eb1858a23af2e
 AUX sks-1.1.5-eddsa.patch 3398 SHA256 072a56943da8d010d7e4e2d550ed4545f259a6334facfb9fe61708f429d8860d SHA512 9a8a955f7880e86c6a73ee6b470737b7926481126ec382e29617b8ce517859e0de5e82c3f83c0f3131fc513b46be3eb427974932e2993c774838bedfd87c30f6 WHIRLPOOL 2fcd324290723e73bdc803b28760e0d7e9836babab413a54963a61f76aa4d4f3d5d33a5c90c36e3f4d0a91f5375a526c9b3154e5cd2369cd5f14b61de4e7a73e
 AUX sks-db.initd 519 SHA256 947a04372252e9e21a020243a678d3f78ba9b6b5fffd8086f83592c772bed467 SHA512 157cdd1477d829acc7b983fbfea015528c16b88938f595cfb6a7bb7c27bf0be4f42d2a69def0e0ef38d618b23db56e241e2712c4eb9ebb837273693e05f2734f WHIRLPOOL 5b12f2434d0229e46b3e50176063df5d8b680f1cb1d003a39d1eb3d3950303b28ecea2e8f5907564a7dcf2c3d4275d7ea555f6530eebd0cac131160e1d573a1c
 AUX sks-db.service 174 SHA256 a6ae25f8f4b4ead48046ce31af89cbc0cd2fb7acc80d6ae241d301dc0059bce8 SHA512 bf90ca8a5c14ccdddb9bc0c4a7493fe10ce54ae8df7ba32773cc3f59d018f74afd3c5302794deb69186cdddbaadc82d7db8d0c3d8862f37862a3c8c104b2365e WHIRLPOOL e03a2329ed423e1d557ad9a37491285ca29f9f677ca05d4b8ae09c912b4a87958e12f70282e56d3c0350183702fafa0ba74b5019bb13d89ecf6e1ca336d22ad5
@@ -8,17 +9,17 @@ AUX sks-recon.initd 582 SHA256 3fa7a70cf1246d755186227ff7ed3ce7c6161f30ea88764b5
 AUX sks-recon.service 187 SHA256 bb68920796fb0fd22ccc433306b65ff988125884988bb3d5beb0449d7e30389d SHA512 45c2734c67fa55f12431a8f80256fc25c2645ad5d0ce148c389c1ac73550354efb65681bc4ac6f319149737759de3de5ea75bdd1f8e927ca76408599ea3dd4ef WHIRLPOOL b260bc4bc1091e96aed0d5e94e80574b3679449962b0dc4953e40a222cc050fc08751d33b64200de01af964b054ee65e15c4d52f7c45f8f01d80cd27e7d0df0a
 AUX sks.confd 87 SHA256 811498c2c964ee109dcbf617682addf0631172bb75e9b221af5b4084f4720214 SHA512 617067acb45e7326ad79726302a1eea9bbebaaad905d5f586469056fe01ff8a3f5cfba1f43dcdec456ffe5c31058b80e3c9f2acbb1d19a9640fee073a2cf3660 WHIRLPOOL 0ee221d86ca478af20aa9e8530eff79ecd0181dbf52da282d41fed6881a6649335281f1907e486bdc1dd4877b930265aefb3e5d189cd6b5c270d383abf329fc7
 DIST sks-1.1.5.tgz 362941 SHA256 92a7f113f0ba7a28d51d7ced60a984d042d8524c651dc3fcafe9d11cc32981a0 SHA512 1fc1248281b4eb6bd0bafad7f3d1600ee86905614ee5c644d532059f972040c2673bee780a414e50e9287fc74fd140ac85db9629d502cff989981904acd3710c WHIRLPOOL 4281b40d72e7370b7c848d683beff2f4bd705a06139a25b27efe5be8a521df9fb870bdeeea97ac3617d542b64fd9c539f90d8f695cea1fec2bdcf267a2d3dc1f
-EBUILD sks-1.1.5-r1.ebuild 3690 SHA256 da6d4e02ff5794986860cf9d021234414e2e965c4b24a6dba55b0c82e76f13bf SHA512 cc41cae4ff61c07e2a88b28c12fd59ae7c50f469afec62c4087214e86df2ef1ef1c02c726031d6da0b240b9e29825dbd497bd357f7e5b35bba556ba73e6992d1 WHIRLPOOL 12e734d029c293cb316547c10b3608e3338850f19f60f23fbd0ff9188c169823568e4992d2731c80373e9315ed931ff34cb22ed46a32794c7c51a949433056ed
+EBUILD sks-1.1.5-r1.ebuild 3744 SHA256 59a3290a68778ed37fe2ab3db0bf1bcbb79717c2ed7a76ad43c071d4dcfbf907 SHA512 2fe11b9e2d29f0b83fd92daa84ab3e302692afc814c945adf5350918191161d2ae8ad400cd1e4c8cc21538a87382a903c3e63d4879513085d29a2307757ad648 WHIRLPOOL 34568b41a214306506df74aa816c9b84403530b449229f840c99c36465d012e1a5f6d1728e8863c31d283ee2b771aad71405f16cc17d1dff5bb375425adb3778
 EBUILD sks-1.1.5.ebuild 3649 SHA256 62ed9424271d4735e5ed5ce20297f3e7f9b668f166c0baa9dd9a914c8ef28190 SHA512 32165890bcc21a8da478a7ff9571b1e4c925688f68f4c1577139411777e34623b218f1c96d564415f699041af5d1fe3b9350a8d47fd7ce91a7d60f844d22a497 WHIRLPOOL 81663e376acd2ea5d844bc05b2adc338275f5413979c9f2f07891bd2fced0c0cfbac79b239bbf4ac8c72b9557d90b05f267887917eb374ebbb0e0b6ad2041319
-MISC ChangeLog 2273 SHA256 9584ef4fbda1a43b4285339e156f6fac41b88503b2a194dcda96e9fcd2b3d82e SHA512 38c12718819ebe99fa6e80541c05f6916f267c456d60dc5de9f055e10f5af6642449e99c4d0ab052cf58e51f567046639a41f9853af86461f1193080263cb026 WHIRLPOOL af6a827d8d9d5e295037eea1eac31d27fb3b4fc6e334b439781fc2e0e84dade549c3e154f559fdf2f3bf579f449bb17b76a2ac2368e823992414869e209b34e9
+MISC ChangeLog 2667 SHA256 0de86eb3e2bbd497955ff6c85fb314697b4d311d4e9a8af345faa8e42f0ea55e SHA512 1f32a184953872dee9085e4dea926b186fb70562af45bbdd519fa11e6e235362d70b38c38d4184c3832baa2fcdfe0a0329ab48b285b35077a8e20a80a41ff76f WHIRLPOOL 3b1fd053cbe4c23eaa8c9a241ef4eaecef356d3321bf8484fa72a51b4241b92fa0f04fa5865c028ed27ea6fb66fba9f3f1568edc8aaa00b3ec73560218814463
 MISC metadata.xml 447 SHA256 4a188356b9206354cdf1796737f2ca208c91c5c3fe828582fa5605dc448b46b1 SHA512 ec7912917617b2ba83ce08df51d76b82428de6a0ef3f51bf5ead947c7674bf329e167d51fa17c505e2676de2f9e5f4d369f825773c1aa5e56b72be90934836cf WHIRLPOOL 5457b615e5089a6551e43770d69bb2b718a2487991fc92f8da736b5a68570b272fa49174808ea16a5797dd194eca5751fa5d03d7b18d6adf2dd0e6d604118993
 -----BEGIN PGP SIGNATURE-----
 
-iQEcBAEBCAAGBQJU0AXDAAoJEP7VAChXwav6LpMIAJ8HvvVHE7EnozwEixaRHcIs
-GSMVoc3XFcjv1qDl6rSg4P3Qf75U1Hx47LLdz5r8PenfFgb/tQFG9BzDsoFPN5vq
-i0WEq1HXSoeQojSkw7IAObFJqA9oUUffT1u55A0nEEN5D0R9HJqTAXO/YgbL/5yj
-8cxmFEZWXYEHBYGg8RX14ZrE0M9RTNjxIamv3QOt3SJs5g0L5a31jr3iKgHvHs9n
-NTXvQb6dO/xIlcJzN9ypSPcVXyPIubk0Pf07QulOoEz8m1e+o6WTTHsOMW3dn4pQ
-PMVolUnwm8W9LCGlBCfOMf4rjW1bcMdB0Fm0OWNMc6nfe7JWJdYsH7FJSO3sT60=
-=RCaI
+iQEcBAEBCAAGBQJVtTWOAAoJECULev7WN52FqwcH/iuXEySxuGmtY1I3eKFbW2GV
+N8L/6Fye7fT0U2UtTWoqmvjuFnfqnmga17Ij/p5Ys1Q/eA7NrBhyujALINMDL4gh
+Y0bQYnI8zHHLLWv2D7YXiLqVnYVzcGgtSljjtzL472uF4IzK5+W7HlPVxNLQBhl9
+713dOeanQDq+frghrUpmMDvtRiRl65bEwTZ4FNQNwoKZgHmMNS1z8Jcqe1Q2HQdt
+qISPi5o++d2DKUMCPkmUtM6W6tY0g6N9bNExkv6A21BLJYPOlFR59vTPTjVkW1rC
+bt4J57h0osdqRGWdcMzsNaLwNlZ9AeS86+lptNzqkgjKjzhbigGKIW9EPrGJ7gc=
+=/3eP
 -----END PGP SIGNATURE-----
diff --git a/net-misc/sks/files/sks-1.1.5-disable-warn-error-a.patch b/net-misc/sks/files/sks-1.1.5-disable-warn-error-a.patch
new file mode 100644
index 000000000000..18af6c524a22
--- /dev/null
+++ b/net-misc/sks/files/sks-1.1.5-disable-warn-error-a.patch
@@ -0,0 +1,29 @@
+From 5142992b465e87181a4674ac614bf7d2fd7110c4 Mon Sep 17 00:00:00 2001
+From: Kristian Fiskerstrand <kristian.fiskerstrand@sumptuouscapital.com>
+Date: Sun, 26 Jul 2015 21:25:53 +0200
+Subject: [PATCH] (Makefile) Disable warn-error A
+
+warn-error A is set for development versions (tagged with +) upstream,
+however it is not intended to actually be fatal errors for released
+versions. We want to keep EdDSA support, i.e it is actually one
+commit past 1.1.5, so just disabling making warnings fatal.
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 543c531..d4a1222 100644
+--- a/Makefile
++++ b/Makefile
+@@ -49,7 +49,7 @@ SKSVS=$(shell grep 'version_suffix = "+"' common.ml)
+ ifeq ($(strip $(SKSVS)),)
+ WARNERR=
+ else
+-WARNERR=-warn-error A
++WARNERR=
+ endif
+ 
+ CAMLP4=-pp $(CAMLP4O)
+-- 
+2.3.6
+
diff --git a/net-misc/sks/sks-1.1.5-r1.ebuild b/net-misc/sks/sks-1.1.5-r1.ebuild
index f7cf570930a4..4ffb821c8686 100644
--- a/net-misc/sks/sks-1.1.5-r1.ebuild
+++ b/net-misc/sks/sks-1.1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/sks-1.1.5-r1.ebuild,v 1.1 2015/02/02 23:18:26 k_f Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/sks/sks-1.1.5-r1.ebuild,v 1.2 2015/07/26 19:32:50 k_f Exp $
 
 EAPI=5
 
@@ -59,6 +59,7 @@ src_prepare() {
 		sks_build.sh || die
 
 	epatch "${FILESDIR}/${P}-eddsa.patch"
+	epatch "${FILESDIR}/${P}-disable-warn-error-a.patch"
 }
 
 src_compile() {