Revision: 26579
http://sourceforge.net/p/gar/code/26579
Author: dmichelsen
Date: 2019-09-12 11:00:34 +0000 (Thu, 12 Sep 2019)
Log Message:
-----------
curl/trunk: Add required patch and bump minor SONAME
Modified Paths:
--------------
csw/mgar/pkg/curl/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/curl/trunk/files/0001-Use-AF_UNIX-instead-of-AF_LOCAL.patch
Modified: csw/mgar/pkg/curl/trunk/Makefile
===================================================================
--- csw/mgar/pkg/curl/trunk/Makefile 2019-09-11 16:16:19 UTC (rev 26578)
+++ csw/mgar/pkg/curl/trunk/Makefile 2019-09-12 11:00:34 UTC (rev 26579)
@@ -18,6 +18,10 @@
VENDOR_URL = http://curl.haxx.se
+# Use patch until this is fixed:
+# https://github.com/curl/curl/issues/4328
+PATCHFILES += 0001-Use-AF_UNIX-instead-of-AF_LOCAL.patch
+
# Because of OpenSSL 1.0 update
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
@@ -189,9 +193,9 @@
@# This is needed because the substitutions from pax args do not change
the
@# contents of the symlink
rm -f $(PKGROOT)$(libdir)/libcurl-feature.so.4
- ln -s libcurl-feature.so.4.5.0 $(PKGROOT)$(libdir)/libcurl-feature.so.4
+ ln -s libcurl-feature.so.4.6.0 $(PKGROOT)$(libdir)/libcurl-feature.so.4
rm -f $(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libcurl-feature.so.4
- ln -s libcurl-feature.so.4.5.0
$(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libcurl-feature.so.4
+ ln -s libcurl-feature.so.4.6.0
$(PKGROOT)$(libdir)/$(ISA_DEFAULT64)/libcurl-feature.so.4
pwd
gdiff -D 64bit \
$(WORKROOTDIR)/install-isa-$(ISA_DEFAULT64)-features-minimal$(includedir)/curl/curlbuild.h
\
Added: csw/mgar/pkg/curl/trunk/files/0001-Use-AF_UNIX-instead-of-AF_LOCAL.patch
===================================================================
--- csw/mgar/pkg/curl/trunk/files/0001-Use-AF_UNIX-instead-of-AF_LOCAL.patch
(rev 0)
+++ csw/mgar/pkg/curl/trunk/files/0001-Use-AF_UNIX-instead-of-AF_LOCAL.patch
2019-09-12 11:00:34 UTC (rev 26579)
@@ -0,0 +1,25 @@
+From cbdf3b0fdf98cfe22e13d97656a1c1f37431113e Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Thu, 12 Sep 2019 12:31:25 +0200
+Subject: [PATCH] Use AF_UNIX instead of AF_LOCAL
+
+---
+ lib/asyn-thread.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/asyn-thread.c b/lib/asyn-thread.c
+index 24da748..9187db1 100755
+--- a/lib/asyn-thread.c
++++ b/lib/asyn-thread.c
+@@ -245,7 +245,7 @@ int init_thread_sync_data(struct thread_data * td,
+
+ #ifdef HAVE_SOCKETPAIR
+ /* create socket pair */
+- if(socketpair(AF_LOCAL, SOCK_STREAM, 0, &tsd->sock_pair[0]) < 0) {
++ if(socketpair(AF_UNIX, SOCK_STREAM, 0, &tsd->sock_pair[0]) < 0) {
+ tsd->sock_pair[0] = CURL_SOCKET_BAD;
+ tsd->sock_pair[1] = CURL_SOCKET_BAD;
+ goto err_exit;
+--
+2.4.0
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
