summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Bar-Lev <alonbl@gentoo.org>2013-06-15 22:37:41 +0000
committerAlon Bar-Lev <alonbl@gentoo.org>2013-06-15 22:37:41 +0000
commitc2d5deb1b9621abe058dc50f2366708a432431f6 (patch)
treeaa15f8b5b13d6548a996a29508ecbcd76d1843e9 /net-libs
parentfixing collitions with two qmail related packages: bug #441774 (diff)
downloadgentoo-2-c2d5deb1b9621abe058dc50f2366708a432431f6.tar.gz
gentoo-2-c2d5deb1b9621abe058dc50f2366708a432431f6.tar.bz2
gentoo-2-c2d5deb1b9621abe058dc50f2366708a432431f6.zip
fix hppa build issue, bug#471914
(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/gnutls/ChangeLog6
-rw-r--r--net-libs/gnutls/files/gnutls-2.12.23-hppa.patch12
-rw-r--r--net-libs/gnutls/gnutls-2.12.23-r1.ebuild3
3 files changed, 19 insertions, 2 deletions
diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index cbd1d7b31d22..4f303db403fd 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/gnutls
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.443 2013/06/11 11:05:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.444 2013/06/15 22:37:41 alonbl Exp $
+
+ 15 Jun 2013; Alon Bar-Lev <alonbl@gentoo.org>
+ +files/gnutls-2.12.23-hppa.patch, gnutls-2.12.23-r1.ebuild:
+ fix hppa build issue, bug#471914
11 Jun 2013; Agostino Sarubbo <ago@gentoo.org> gnutls-2.12.23-r1.ebuild:
Stable for sh, wrt bug #471788
diff --git a/net-libs/gnutls/files/gnutls-2.12.23-hppa.patch b/net-libs/gnutls/files/gnutls-2.12.23-hppa.patch
new file mode 100644
index 000000000000..3ae5be8be3ca
--- /dev/null
+++ b/net-libs/gnutls/files/gnutls-2.12.23-hppa.patch
@@ -0,0 +1,12 @@
+diff -urNp gnutls-2.12.23/gl/tests/test-fcntl-h.c gnutls-2.12.23.new/gl/tests/test-fcntl-h.c
+--- gnutls-2.12.23/gl/tests/test-fcntl-h.c 2012-11-11 05:16:55.000000000 +0200
++++ gnutls-2.12.23.new/gl/tests/test-fcntl-h.c 2013-06-16 01:31:28.315827891 +0300
+@@ -111,7 +111,7 @@ main (void)
+ #if O_RSYNC && O_RSYNC != O_DSYNC
+ case O_RSYNC:
+ #endif
+-#if O_SYNC && O_SYNC != O_RSYNC
++#if O_SYNC && O_SYNC != O_RSYNC && O_SYNC != O_DSYNC
+ case O_SYNC:
+ #endif
+ #if O_TTY_INIT
diff --git a/net-libs/gnutls/gnutls-2.12.23-r1.ebuild b/net-libs/gnutls/gnutls-2.12.23-r1.ebuild
index d41fffbdd06b..bdf425dbde1e 100644
--- a/net-libs/gnutls/gnutls-2.12.23-r1.ebuild
+++ b/net-libs/gnutls/gnutls-2.12.23-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/net-libs/gnutls/gnutls-2.12.23-r1.ebuild,v 1.12 2013/06/11 11:05:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.12.23-r1.ebuild,v 1.13 2013/06/15 22:37:41 alonbl Exp $
EAPI=5
@@ -58,6 +58,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-2.12.20-libadd.patch
epatch "${FILESDIR}"/${PN}-2.12.20-guile-parallelmake.patch
epatch "${FILESDIR}"/${PN}-2.12.23-CVE-2013-2116.patch
+ epatch "${FILESDIR}"/${PN}-2.12.23-hppa.patch
# support user patches
epatch_user