summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaohiro Aota <naota@gentoo.org>2014-04-13 00:43:13 +0000
committerNaohiro Aota <naota@gentoo.org>2014-04-13 00:43:13 +0000
commite319ed52afdad8737b14a14730096a35bdec9770 (patch)
tree58965ec0f61914377215cb7749a9d57df803c1b7 /net-misc
parentUse 0 instead of root for group name. #507466 (diff)
downloadgentoo-2-e319ed52afdad8737b14a14730096a35bdec9770.tar.gz
gentoo-2-e319ed52afdad8737b14a14730096a35bdec9770.tar.bz2
gentoo-2-e319ed52afdad8737b14a14730096a35bdec9770.zip
Add a upstream patch to build on FreeBSD. #507494
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F8551514)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/curl/ChangeLog6
-rw-r--r--net-misc/curl/curl-7.36.0.ebuild5
-rw-r--r--net-misc/curl/files/curl-7.36.0-hostcheck.patch27
3 files changed, 35 insertions, 3 deletions
diff --git a/net-misc/curl/ChangeLog b/net-misc/curl/ChangeLog
index 613d5fb7ba6b..a63b272c1b9d 100644
--- a/net-misc/curl/ChangeLog
+++ b/net-misc/curl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/curl
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.350 2014/04/12 09:33:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/ChangeLog,v 1.351 2014/04/13 00:43:13 naota Exp $
+
+ 13 Apr 2014; Naohiro Aota <naota@gentoo.org>
+ +files/curl-7.36.0-hostcheck.patch, curl-7.36.0.ebuild:
+ Add a upstream patch to build on FreeBSD. #507494
12 Apr 2014; Agostino Sarubbo <ago@gentoo.org> curl-7.36.0.ebuild:
Stable for x86, wrt bug #505864
diff --git a/net-misc/curl/curl-7.36.0.ebuild b/net-misc/curl/curl-7.36.0.ebuild
index 32cc249747fc..402595113b2e 100644
--- a/net-misc/curl/curl-7.36.0.ebuild
+++ b/net-misc/curl/curl-7.36.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild,v 1.8 2014/04/12 09:33:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/curl/curl-7.36.0.ebuild,v 1.9 2014/04/13 00:43:13 naota Exp $
EAPI="5"
@@ -84,7 +84,8 @@ src_prepare() {
epatch \
"${FILESDIR}"/${PN}-7.30.0-prefix.patch \
"${FILESDIR}"/${PN}-respect-cflags-3.patch \
- "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+ "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch \
+ "${FILESDIR}"/${P}-hostcheck.patch #507494
sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
diff --git a/net-misc/curl/files/curl-7.36.0-hostcheck.patch b/net-misc/curl/files/curl-7.36.0-hostcheck.patch
new file mode 100644
index 000000000000..243159d90d72
--- /dev/null
+++ b/net-misc/curl/files/curl-7.36.0-hostcheck.patch
@@ -0,0 +1,27 @@
+From a8c7cf62811d688efeff49f8f9ab942b525ebfd4 Mon Sep 17 00:00:00 2001
+From: Dan Fandrich <dan@coneharvesters.com>
+Date: Wed, 26 Mar 2014 22:27:34 +0100
+Subject: [PATCH] hostcheck: added a system include to define struct in_addr
+
+---
+ lib/hostcheck.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/hostcheck.c b/lib/hostcheck.c
+index 162c522..42eb2ee 100644
+--- a/lib/hostcheck.c
++++ b/lib/hostcheck.c
+@@ -26,6 +26,10 @@
+ defined(USE_GSKIT)
+ /* these backends use functions from this file */
+
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++
+ #include "hostcheck.h"
+ #include "rawstr.h"
+ #include "inet_pton.h"
+--
+1.9.1
+