From 4cb344b6539156c07df69cab2c392fbca6b785e3 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Mon, 21 Sep 2015 21:12:17 +0200
Subject: [PATCH] curl: added three new options: ldap (off), ssh (on) and rtmp
 (off).

---
 common/options.description |  3 +++
 srcpkgs/curl/template      | 14 +++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/common/options.description b/common/options.description
index 09b7322fdc..b839d2d823 100644
--- a/common/options.description
+++ b/common/options.description
@@ -29,6 +29,7 @@ desc_option_imagemagick="Enable support for ImageMagick"
 desc_option_jack="Enable support for the JACK sound server"
 desc_option_jpeg="Enable support for JPEG images"
 desc_option_lame="Enable support for the LAME encoder"
+desc_option_ldap="Enable support for LDAP"
 desc_option_ldns="Enable support for LDNS DNSSEC library"
 desc_option_libao="Enable support for libao sound library"
 desc_option_libedit="Enable support for NetBSD's libedit"
@@ -51,11 +52,13 @@ desc_option_qt="Enable support for building the QT UI"
 desc_option_raw="Enable support for RAW image files"
 desc_option_readline="Enable support for GNU readline"
 desc_option_rpi="Enable support for Raspberry Pi"
+desc_option_rtmp="Enable support for RTMP"
 desc_option_sasl="Enable support for SASL"
 desc_option_sdl="Enable support for SDL (1.x)"
 desc_option_sdl2="Enable support for SDL (2.x)"
 desc_option_smb="Enable support for SMB protocol"
 desc_option_sndio="Enable support for the sndio sound server"
+desc_option_ssh="Enable support for SSH"
 desc_option_ssl="Enable support for SSL"
 desc_option_startup_notification="Enable support for desktop notification"
 desc_option_static="Enable static linking"
diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index f68660d340..594d4e066e 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -1,13 +1,17 @@
 # Template build file for 'curl'.
 pkgname=curl
 version=7.44.0
-revision=2
+revision=3
 build_style=gnu-configure
-configure_args="ac_cv_sizeof_off_t=8 --disable-ldaps --without-gssapi
- --enable-threaded-resolver --enable-ipv6 $(vopt_with ssl) $(vopt_with gnutls)
+configure_args="ac_cv_sizeof_off_t=8 --without-gssapi
+ --enable-threaded-resolver --enable-ipv6 $(vopt_with rtmp)
+ $(vopt_with ldap '--enable-ldap --enable-ldaps' '--disable-ldap --disable-ldaps')
+ $(vopt_with ssh ssh2) $(vopt_with ssl) $(vopt_with gnutls)
  --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
 hostmakedepends="pkg-config perl groff"
 makedepends="zlib-devel libidn-devel nghttp2-devel
+ $(vopt_if rtmp librtmp-devel)
+ $(vopt_if ldap libldap-devel) $(vopt_if ssh libssh2-devel)
  $(vopt_if ssl libressl-devel) $(vopt_if gnutls gnutls-devel)"
 depends="ca-certificates"
 short_desc="Client that groks URLs"
@@ -17,8 +21,8 @@ homepage="http://curl.haxx.se"
 distfiles="$homepage/download/$pkgname-$version.tar.bz2"
 checksum=1e2541bae6582bb697c0fbae49e1d3e6fad5d05d5aa80dbd6f072e0a44341814
 
-build_options="gnutls ssl"
-build_options_default="ssl"
+build_options="gnutls ldap rtmp ssh ssl"
+build_options_default="ssh ssl"
 vopt_conflict ssl gnutls
 
 libcurl_package() {