diff options
| author |   Kristian Fiskerstrand <k_f@gentoo.org> | 2015-07-26 19:32:51 +0000 |
|---|---|---|
| committer | Kristian Fiskerstrand <k_f@gentoo.org> | 2015-07-26 19:32:51 +0000 |
| commit | b0f2d584a1d10489083e042fb121570fed896a55 (patch) | |
| tree | e14490ec936a01c7e6354306e4d0bc865ec40869 /net-misc | |
| parent | Revert pypy support because of unsatisfiable dependencies. (diff) | |
| download | gentoo-2-b0f2d584a1d10489083e042fb121570fed896a55.tar.gz gentoo-2-b0f2d584a1d10489083e042fb121570fed896a55.tar.bz2 gentoo-2-b0f2d584a1d10489083e042fb121570fed896a55.zip | |
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.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x250B7AFED6379D85!)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/sks/ChangeLog | 9 | ||||
| -rw-r--r-- | net-misc/sks/files/sks-1.1.5-disable-warn-error-a.patch | 29 | ||||
| -rw-r--r-- | net-misc/sks/sks-1.1.5-r1.ebuild | 3 |
3 files changed, 39 insertions, 2 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/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() { |