curl: Support selectively enabling non-HTTP

2 files changed, 173 insertions, 0 deletions

diff --git a/etc/import/TARGETS.curl b/etc/import/TARGETS.curl
index 230066f3..32ebc274 100644
--- a/etc/import/TARGETS.curl
+++ b/etc/import/TARGETS.curl
@@ -21,6 +21,20 @@
     , "USE_ZLIB"
     , "ENABLE_ARES"
     , "ENABLE_THREADED_RESOLVER"
+    , "CURL_DISABLE_DICT"
+    , "CURL_DISABLE_FILE"
+    , "CURL_DISABLE_FTP"
+    , "CURL_DISABLE_GOPHER"
+    , "CURL_DISABLE_IMAP"
+    , "CURL_DISABLE_LDAP"
+    , "CURL_DISABLE_LDAPS"
+    , "CURL_DISABLE_MQTT"
+    , "CURL_DISABLE_POP3"
+    , "CURL_DISABLE_RTSP"
+    , "CURL_DISABLE_SMB"
+    , "CURL_DISABLE_SMTP"
+    , "CURL_DISABLE_TELNET"
+    , "CURL_DISABLE_TFTP"
     , "HTTP_ONLY"
     , "CURL_DISABLE_ALTSVC"
     , "CURL_DISABLE_COOKIES"
@@ -79,6 +93,20 @@
       [ "Boolean. Enables AsynchDNS by threading if ~ENABLE_ARES==false~."
       , "If ~OS==\"windows\"~, uses win32 threads, otherwise pthreads."
       ]
+    , "CURL_DISABLE_DICT": ["Boolean. Disable DICT."]
+    , "CURL_DISABLE_FILE": ["Boolean. Disable FILE."]
+    , "CURL_DISABLE_FTP": ["Boolean. Disable FTP."]
+    , "CURL_DISABLE_GOPHER": ["Boolean. Disable GOPHER."]
+    , "CURL_DISABLE_IMAP": ["Boolean. Disable IMAP."]
+    , "CURL_DISABLE_LDAP": ["Boolean. Disable LDAP."]
+    , "CURL_DISABLE_LDAPS": ["Boolean. Disable LDAPS."]
+    , "CURL_DISABLE_MQTT": ["Boolean. Disable MQTT."]
+    , "CURL_DISABLE_POP3": ["Boolean. Disable POP3."]
+    , "CURL_DISABLE_RTSP": ["Boolean. Disable RTSP."]
+    , "CURL_DISABLE_SMB": ["Boolean. Disable SMB."]
+    , "CURL_DISABLE_SMTP": ["Boolean. Disable SMTP."]
+    , "CURL_DISABLE_TELNET": ["Boolean. Disable TELNET."]
+    , "CURL_DISABLE_TFTP": ["Boolean. Disable TFTP."]
     , "HTTP_ONLY":
       [ "true|null: Disables the following advanced options:"
       , "DICT, FILE, FTP, GOPHER, IMAP, LDAP, LDAPS,"
@@ -203,6 +231,20 @@
     , "USE_ZLIB"
     , "ENABLE_ARES"
     , "ENABLE_THREADED_RESOLVER"
+    , "CURL_DISABLE_DICT"
+    , "CURL_DISABLE_FILE"
+    , "CURL_DISABLE_FTP"
+    , "CURL_DISABLE_GOPHER"
+    , "CURL_DISABLE_IMAP"
+    , "CURL_DISABLE_LDAP"
+    , "CURL_DISABLE_LDAPS"
+    , "CURL_DISABLE_MQTT"
+    , "CURL_DISABLE_POP3"
+    , "CURL_DISABLE_RTSP"
+    , "CURL_DISABLE_SMB"
+    , "CURL_DISABLE_SMTP"
+    , "CURL_DISABLE_TELNET"
+    , "CURL_DISABLE_TFTP"
     , "HTTP_ONLY"
     , "CURL_DISABLE_ALTSVC"
     , "CURL_DISABLE_COOKIES"
@@ -283,6 +325,48 @@
             }
           }
         ]
+      , [ "CURL_DISABLE_DICT"
+        , {"type": "var", "name": "CURL_DISABLE_DICT", "default": false}
+        ]
+      , [ "CURL_DISABLE_FILE"
+        , {"type": "var", "name": "CURL_DISABLE_FILE", "default": false}
+        ]
+      , [ "CURL_DISABLE_FTP"
+        , {"type": "var", "name": "CURL_DISABLE_FTP", "default": false}
+        ]
+      , [ "CURL_DISABLE_GOPHER"
+        , {"type": "var", "name": "CURL_DISABLE_GOPHER", "default": false}
+        ]
+      , [ "CURL_DISABLE_IMAP"
+        , {"type": "var", "name": "CURL_DISABLE_IMAP", "default": false}
+        ]
+      , [ "CURL_DISABLE_LDAP"
+        , {"type": "var", "name": "CURL_DISABLE_LDAP", "default": false}
+        ]
+      , [ "CURL_DISABLE_LDAPS"
+        , {"type": "var", "name": "CURL_DISABLE_LDAPS", "default": false}
+        ]
+      , [ "CURL_DISABLE_MQTT"
+        , {"type": "var", "name": "CURL_DISABLE_MQTT", "default": false}
+        ]
+      , [ "CURL_DISABLE_POP3"
+        , {"type": "var", "name": "CURL_DISABLE_POP3", "default": false}
+        ]
+      , [ "CURL_DISABLE_RTSP"
+        , {"type": "var", "name": "CURL_DISABLE_RTSP", "default": false}
+        ]
+      , [ "CURL_DISABLE_SMB"
+        , {"type": "var", "name": "CURL_DISABLE_SMB", "default": false}
+        ]
+      , [ "CURL_DISABLE_SMTP"
+        , {"type": "var", "name": "CURL_DISABLE_SMTP", "default": false}
+        ]
+      , [ "CURL_DISABLE_TELNET"
+        , {"type": "var", "name": "CURL_DISABLE_TELNET", "default": false}
+        ]
+      , [ "CURL_DISABLE_TFTP"
+        , {"type": "var", "name": "CURL_DISABLE_TFTP", "default": false}
+        ]
       , ["HTTP_ONLY", {"type": "var", "name": "HTTP_ONLY", "default": false}]
       , [ "CURL_DISABLE_ALTSVC"
         , {"type": "var", "name": "CURL_DISABLE_ALTSVC", "default": false}
@@ -431,6 +515,20 @@
         , "CURL_HIDDEN_SYMBOLS"
         , "ENABLE_ARES"
         , "ENABLE_THREADED_RESOLVER"
+        , "CURL_DISABLE_DICT"
+        , "CURL_DISABLE_FILE"
+        , "CURL_DISABLE_FTP"
+        , "CURL_DISABLE_GOPHER"
+        , "CURL_DISABLE_IMAP"
+        , "CURL_DISABLE_LDAP"
+        , "CURL_DISABLE_LDAPS"
+        , "CURL_DISABLE_MQTT"
+        , "CURL_DISABLE_POP3"
+        , "CURL_DISABLE_RTSP"
+        , "CURL_DISABLE_SMB"
+        , "CURL_DISABLE_SMTP"
+        , "CURL_DISABLE_TELNET"
+        , "CURL_DISABLE_TFTP"
         , "HTTP_ONLY"
         , "CURL_DISABLE_ALTSVC"
         , "CURL_DISABLE_COOKIES"
diff --git a/etc/import/lib/TARGETS.curl b/etc/import/lib/TARGETS.curl
index 5e5ec9b0..4d41afe1 100644
--- a/etc/import/lib/TARGETS.curl
+++ b/etc/import/lib/TARGETS.curl
@@ -8,6 +8,20 @@
     , "USE_ZLIB"
     , "ENABLE_ARES"
     , "ENABLE_THREADED_RESOLVER"
+    , "CURL_DISABLE_DICT"
+    , "CURL_DISABLE_FILE"
+    , "CURL_DISABLE_FTP"
+    , "CURL_DISABLE_GOPHER"
+    , "CURL_DISABLE_IMAP"
+    , "CURL_DISABLE_LDAP"
+    , "CURL_DISABLE_LDAPS"
+    , "CURL_DISABLE_MQTT"
+    , "CURL_DISABLE_POP3"
+    , "CURL_DISABLE_RTSP"
+    , "CURL_DISABLE_SMB"
+    , "CURL_DISABLE_SMTP"
+    , "CURL_DISABLE_TELNET"
+    , "CURL_DISABLE_TFTP"
     , "HTTP_ONLY"
     , "CURL_DISABLE_ALTSVC"
     , "CURL_DISABLE_COOKIES"
@@ -167,6 +181,67 @@
                 , ["CURL_DISABLE_TELNET", 1]
                 , ["CURL_DISABLE_TFTP", 1]
                 ]
+              , "else":
+                { "type": "++"
+                , "$1":
+                  [ { "type": "if"
+                    , "cond": {"type": "var", "name": "CURL_DISABLE_DICT"}
+                    , "then": [["CURL_DISABLE_DICT", 1]]
+                    }
+                  , { "type": "if"
+                    , "cond": {"type": "var", "name": "CURL_DISABLE_FILE"}
+                    , "then": [["CURL_DISABLE_FILE", 1]]
+                    }
+                  , { "type": "if"
+                    , "cond": {"type": "var", "name": "CURL_DISABLE_FTP"}
+                    , "then": [["CURL_DISABLE_FTP", 1]]
+                    }
+                  , { "type": "if"
+                    , "cond": {"type": "var", "name": "CURL_DISABLE_GOPHER"}
+                    , "then": [["CURL_DISABLE_GOPHER", 1]]
+                    }
+                  , { "type": "if"
+                    , "cond": {"type": "var", "name": "CURL_DISABLE_IMAP"}
+                    , "then": [["CURL_DISABLE_IMAP", 1]]
+                    }
+                  , { "type": "if"
+                    , "cond": {"type": "var", "name": "CURL_DISABLE_LDAP"}
+                    , "then": [["CURL_DISABLE_LDAP", 1]]
+                    }
+                  , { "type": "if"
+                    , "cond": {"type": "var", "name": "CURL_DISABLE_LDAPS"}
+                    , "then": [["CURL_DISABLE_LDAPS", 1]]
+                    }
+                  , { "type": "if"
+                    , "cond": {"type": "var", "name": "CURL_DISABLE_MQTT"}
+                    , "then": [["CURL_DISABLE_MQTT", 1]]
+                    }
+                  , { "type": "if"
+                    , "cond": {"type": "var", "name": "CURL_DISABLE_POP3"}
+                    , "then": [["CURL_DISABLE_POP3", 1]]
+                    }
+                  , { "type": "if"
+                    , "cond": {"type": "var", "name": "CURL_DISABLE_RTSP"}
+                    , "then": [["CURL_DISABLE_RTSP", 1]]
+                    }
+                  , { "type": "if"
+                    , "cond": {"type": "var", "name": "CURL_DISABLE_SMB"}
+                    , "then": [["CURL_DISABLE_SMB", 1]]
+                    }
+                  , { "type": "if"
+                    , "cond": {"type": "var", "name": "CURL_DISABLE_SMTP"}
+                    , "then": [["CURL_DISABLE_SMTP", 1]]
+                    }
+                  , { "type": "if"
+                    , "cond": {"type": "var", "name": "CURL_DISABLE_TELNET"}
+                    , "then": [["CURL_DISABLE_TELNET", 1]]
+                    }
+                  , { "type": "if"
+                    , "cond": {"type": "var", "name": "CURL_DISABLE_TFTP"}
+                    , "then": [["CURL_DISABLE_TFTP", 1]]
+                    }
+                  ]
+                }
               }
             , [ ["USE_ARES", {"type": "var", "name": "ENABLE_ARES"}]
               , [ "CURL_DISABLE_ALTSVC"