Skip to content

Commit a72789d

Browse files
authored
Merge pull request #1 from ned14/hunter-7.74.0
Rebase hunter curl fork onto curl 7.74.0
2 parents e052859 + 76dcb42 commit a72789d

12 files changed

+1689
-810
lines changed

.gitattributes

+97-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,97 @@
1-
*.dsw -crlf
2-
buildconf eol=lf
3-
configure.ac eol=lf
4-
*.m4 eol=lf
5-
*.in eol=lf
6-
*.am eol=lf
7-
*.sh eol=lf
8-
*.[ch] whitespace=tab-in-indent
1+
* text=auto !eol svneol=native#text/plain
2+
*.gitattributes text svneol=native#text/plain
3+
4+
# Scriptish formats
5+
*.bat text svneol=native#text/plain
6+
*.bsh text svneol=native#text/x-beanshell
7+
*.cgi text svneol=native#text/plain
8+
*.cmd text svneol=native#text/plain
9+
*.js text svneol=native#text/javascript
10+
*.php text svneol=native#text/x-php
11+
*.pl text svneol=native#text/x-perl
12+
*.pm text svneol=native#text/x-perl
13+
*.py text svneol=native#text/x-python
14+
*.sh eol=lf svneol=LF#text/x-sh
15+
configure eol=lf svneol=LF#text/x-sh
16+
17+
# Image formats
18+
*.bmp binary svneol=unset#image/bmp
19+
*.gif binary svneol=unset#image/gif
20+
*.ico binary svneol=unset#image/ico
21+
*.jpeg binary svneol=unset#image/jpeg
22+
*.jpg binary svneol=unset#image/jpeg
23+
*.png binary svneol=unset#image/png
24+
*.tif binary svneol=unset#image/tiff
25+
*.tiff binary svneol=unset#image/tiff
26+
*.svg text svneol=native#image/svg%2Bxml
27+
28+
# Data formats
29+
*.pdf binary svneol=unset#application/pdf
30+
*.avi binary svneol=unset#video/avi
31+
*.doc binary svneol=unset#application/msword
32+
*.dsp text svneol=crlf#text/plain
33+
*.dsw text svneol=crlf#text/plain
34+
*.eps binary svneol=unset#application/postscript
35+
*.json text svneol=native#application/json
36+
*.gz binary svneol=unset#application/gzip
37+
*.mov binary svneol=unset#video/quicktime
38+
*.mp3 binary svneol=unset#audio/mpeg
39+
*.ppt binary svneol=unset#application/vnd.ms-powerpoint
40+
*.ps binary svneol=unset#application/postscript
41+
*.psd binary svneol=unset#application/photoshop
42+
*.rdf binary svneol=unset#text/rdf
43+
*.rss text svneol=unset#text/xml
44+
*.rtf binary svneol=unset#text/rtf
45+
*.sln text svneol=native#text/plain
46+
*.swf binary svneol=unset#application/x-shockwave-flash
47+
*.tgz binary svneol=unset#application/gzip
48+
*.vcproj text svneol=native#text/xml
49+
*.vcxproj text svneol=native#text/xml
50+
*.vsprops text svneol=native#text/xml
51+
*.wav binary svneol=unset#audio/wav
52+
*.xls binary svneol=unset#application/vnd.ms-excel
53+
*.zip binary svneol=unset#application/zip
54+
55+
# Text formats
56+
.htaccess text svneol=native#text/plain
57+
*.bbk text svneol=native#text/xml
58+
*.cmake text svneol=native#text/plain
59+
*.css text svneol=native#text/css
60+
*.dtd text svneol=native#text/xml
61+
*.htm text svneol=native#text/html
62+
*.html text svneol=native#text/html
63+
*.ini text svneol=native#text/plain
64+
*.log text svneol=native#text/plain
65+
*.mak text svneol=native#text/plain
66+
*.qbk text svneol=native#text/plain
67+
*.rst text svneol=native#text/plain
68+
*.sql text svneol=native#text/x-sql
69+
*.txt text svneol=native#text/plain
70+
*.xhtml text svneol=native#text/xhtml%2Bxml
71+
*.xml text svneol=native#text/xml
72+
*.xsd text svneol=native#text/xml
73+
*.xsl text svneol=native#text/xml
74+
*.xslt text svneol=native#text/xml
75+
*.xul text svneol=native#text/xul
76+
*.yml text svneol=native#text/plain
77+
boost-no-inspect text svneol=native#text/plain
78+
CHANGES text svneol=native#text/plain
79+
COPYING text svneol=native#text/plain
80+
INSTALL text svneol=native#text/plain
81+
Jamfile text svneol=native#text/plain
82+
Jamroot text svneol=native#text/plain
83+
Jamfile.v2 text svneol=native#text/plain
84+
Jamrules text svneol=native#text/plain
85+
Makefile* text svneol=native#text/plain
86+
README text svneol=native#text/plain
87+
TODO text svneol=native#text/plain
88+
89+
# Code formats
90+
*.c text svneol=native#text/plain
91+
*.cpp text svneol=native#text/plain
92+
*.h text svneol=native#text/plain
93+
*.hpp text svneol=native#text/plain
94+
*.ipp text svneol=native#text/plain
95+
*.tpp text svneol=native#text/plain
96+
*.jam text svneol=native#text/plain
97+
*.java text svneol=native#text/plain

CMake/Config.cmake.in

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
@PACKAGE_INIT@
2+
3+
if("@ENABLE_ARES@")
4+
find_package(c-ares CONFIG REQUIRED)
5+
endif()
6+
7+
if(@HAVE_ZLIB@)
8+
find_package(ZLIB CONFIG REQUIRED)
9+
endif()
10+
if(@HAVE_ZSTD@)
11+
find_package(zstd CONFIG REQUIRED)
12+
endif()
13+
if(@HAVE_LIBSSH2@)
14+
find_package(Libssh2 CONFIG REQUIRED)
15+
endif()
16+
if(@HAVE_LIBCRYPTO@)
17+
if(@CMAKE_USE_BORINGSSL@)
18+
find_package(BoringSSL CONFIG REQUIRED)
19+
else()
20+
find_package(OpenSSL REQUIRED)
21+
endif()
22+
endif()
23+
24+
find_package(intsizeof CONFIG REQUIRED)
25+
26+
include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]")
27+
check_required_components("@PROJECT_NAME@")

0 commit comments

Comments
 (0)