curl and openssl rebuild

system/base/curl/actions.py

@@ -18,6 +18,9 @@ def setup():
                          --with-zlib \
                          --with-libidn \
                          --with-libssh2 \
+                         --with-gssapi=no \
+                         --with-nghttp2 \
+                         --with-libmetalink \
                          --without-librtmp \
                          --enable-ipv6 \
                          --enable-http \
@@ -32,7 +35,12 @@ def setup():
                          --enable-threaded-resolver \
                          --enable-hidden-symbols \
                          --disable-versioned-symbols \
-                         --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt")
+                         ac_cv_header_gss_h=no \
+                         --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
+                         --prefix=/usr \
+                         --with-random=/dev/urandom \
+                         --mandir=/usr/share/man ")
+
 
 def build():
     autotools.make()

system/base/curl/files/curl-ac.patch

@@ -0,0 +1,12 @@
+diff -urN curl-7.12.1.org/configure.ac curl-7.12.1/configure.ac
+--- curl-7.12.1.org/configure.ac	2004-08-13 02:20:37.003335512 +0200
++++ curl-7.12.1/configure.ac	2004-08-13 02:21:07.172749064 +0200
+@@ -392,7 +392,7 @@
+ main()
+ {
+  if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
+-   exit(1);
++   exit(0);
+  else
+    exit(0);
+ }

system/base/curl/files/curl-krb5flags.patch

@@ -0,0 +1,20 @@
+--- curl-7.37.1/configure.ac.orig	2014-07-19 10:27:07.972697344 +0200
++++ curl-7.37.1/configure.ac	2014-07-19 10:28:38.279360218 +0200
+@@ -1195,7 +1195,7 @@
+      if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
+         GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
+      elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then
+-        GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
++        GSSAPI_INCS=`CFLAGS= $GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
+      elif test -f "$KRB5CONFIG"; then
+         GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
+      elif test "$GSSAPI_ROOT" != "yes"; then
+@@ -1285,7 +1285,7 @@
+         elif test -f "$KRB5CONFIG"; then
+            dnl krb5-config doesn't have --libs-only-L or similar, put everything
+            dnl into LIBS
+-           gss_libs=`$KRB5CONFIG --libs gssapi`
++           gss_libs=`CFLAGS= $KRB5CONFIG --libs gssapi`
+            LIBS="$gss_libs $LIBS"
+         else
+            case $host in

system/base/curl/pspec.xml

@@ -23,6 +23,10 @@
             <Dependency>libssh2-devel</Dependency>
             <Dependency>ca-certificates</Dependency>
         </BuildDependencies>
+        <Patches>
+            <Patch>curl-krb5flags.patch</Patch>
+            <Patch>curl-ac.patch</Patch>
+        </Patches>
     </Source>
 
     <Package>
@@ -62,6 +66,13 @@
     </Package>
 
     <History>
+        <Update release="14">
+            <Date>2015-05-28</Date>
+            <Version>7.42.1</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Vedat Demir</Name>
+            <Email>vedat@pisilinux.org</Email>
+        </Update>
         <Update release="13">
             <Date>2015-05-01</Date>
             <Version>7.42.1</Version>