[CVE-2017-9502] url: fix buffer overwrite with file protocol

[platform/upstream/curl.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 61cc5ec..33f900a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -24,10 +24,13 @@ AUTOMAKE_OPTIONS = foreign
 
 ACLOCAL_AMFLAGS = -I m4
 
-CMAKE_DIST = CMakeLists.txt CMake/CMakeConfigurableFile.in     \
- CMake/CurlTests.c CMake/FindGSS.cmake CMake/OtherTests.cmake  \
- CMake/Platforms/WindowsCache.cmake CMake/Utilities.cmake      \
- include/curl/curlbuild.h.cmake CMake/Macros.cmake
+CMAKE_DIST = CMakeLists.txt CMake/CMakeConfigurableFile.in      \
+ CMake/CurlTests.c CMake/FindGSS.cmake CMake/OtherTests.cmake   \
+ CMake/Platforms/WindowsCache.cmake CMake/Utilities.cmake       \
+ include/curl/curlbuild.h.cmake CMake/Macros.cmake              \
+ CMake/CurlSymbolHiding.cmake CMake/FindCARES.cmake             \
+ CMake/FindLibSSH2.cmake CMake/FindNGHTTP2.cmake
+
 
 VC6_LIBTMPL = projects/Windows/VC6/lib/libcurl.tmpl
 VC6_LIBDSP = projects/Windows/VC6/lib/libcurl.dsp.dist
@@ -133,8 +136,7 @@ VC_DIST = projects/README                           \
  projects/Windows/VC14/src/curl.vcxproj.filters
 
 WINBUILD_DIST = winbuild/BUILD.WINDOWS.txt winbuild/gen_resp_file.bat  \
- winbuild/MakefileBuild.vc winbuild/Makefile.vc                                \
- winbuild/Makefile.msvc.names
+ winbuild/MakefileBuild.vc winbuild/Makefile.vc
 
 EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in      \
  RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework scripts/zsh.pl \
@@ -149,8 +151,8 @@ CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) $(VC7_LIBVCPROJ) $(VC7_SRCVCPROJ)  \
 
 bin_SCRIPTS = curl-config
 
-SUBDIRS = lib src include scripts
-DIST_SUBDIRS = $(SUBDIRS) tests packages docs
+SUBDIRS = lib src include
+DIST_SUBDIRS = $(SUBDIRS) tests packages docs scripts
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libcurl.pc
@@ -282,6 +284,9 @@ ca-firefox: lib/firefox-db2pem.sh
 checksrc:
        cd lib && $(MAKE) checksrc
        cd src && $(MAKE) checksrc
+       cd tests && $(MAKE) checksrc
+       cd include/curl && $(MAKE) checksrc
+       cd docs/examples && $(MAKE) checksrc
 
 .PHONY: vc-ide
 
@@ -294,6 +299,8 @@ vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS) \
        @(win32_lib_srcs='$(LIB_CFILES)'; \
        win32_lib_hdrs='$(LIB_HFILES) config-win32.h'; \
        win32_lib_rc='$(LIB_RCFILES)'; \
+       win32_lib_vauth_srcs='$(LIB_VAUTH_CFILES)'; \
+       win32_lib_vauth_hdrs='$(LIB_VAUTH_HFILES)'; \
        win32_lib_vtls_srcs='$(LIB_VTLS_CFILES)'; \
        win32_lib_vtls_hdrs='$(LIB_VTLS_HFILES)'; \
        win32_src_srcs='$(CURL_CFILES)'; \
@@ -304,6 +311,8 @@ vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS) \
        \
        sorted_lib_srcs=`for file in $$win32_lib_srcs; do echo $$file; done | sort`; \
        sorted_lib_hdrs=`for file in $$win32_lib_hdrs; do echo $$file; done | sort`; \
+       sorted_lib_vauth_srcs=`for file in $$win32_lib_vauth_srcs; do echo $$file; done | sort`; \
+       sorted_lib_vauth_hdrs=`for file in $$win32_lib_vauth_hdrs; do echo $$file; done | sort`; \
        sorted_lib_vtls_srcs=`for file in $$win32_lib_vtls_srcs; do echo $$file; done | sort`; \
        sorted_lib_vtls_hdrs=`for file in $$win32_lib_vtls_hdrs; do echo $$file; done | sort`; \
        sorted_src_srcs=`for file in $$win32_src_srcs; do echo $$file; done | sort`; \
@@ -314,10 +323,11 @@ vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS)       \
        awk_code='\
 function gen_element(type, dir, file)\
 {\
+  sub(/vauth\//, "", file);\
   sub(/vtls\//, "", file);\
 \
   spaces="    ";\
-  if(dir == "lib\\vtls")\
+  if(dir == "lib\\vauth" || dir == "lib\\vtls")\
     tabs="                             ";\
   else\
     tabs="                     ";\
@@ -371,6 +381,14 @@ function gen_element(type, dir, file)\
     split(lib_rc, arr);\
     for(val in arr) gen_element(proj_type, "lib", arr[val]);\
   }\
+  else if($$0 == "CURL_LIB_VAUTH_C_FILES") {\
+    split(lib_vauth_srcs, arr);\
+    for(val in arr) gen_element(proj_type, "lib\\vauth", arr[val]);\
+  }\
+  else if($$0 == "CURL_LIB_VAUTH_H_FILES") {\
+    split(lib_vauth_hdrs, arr);\
+    for(val in arr) gen_element(proj_type, "lib\\vauth", arr[val]);\
+  }\
   else if($$0 == "CURL_LIB_VTLS_C_FILES") {\
     split(lib_vtls_srcs, arr);\
     for(val in arr) gen_element(proj_type, "lib\\vtls", arr[val]);\
@@ -414,6 +432,8 @@ function gen_element(type, dir, file)\
                -v lib_srcs="$$sorted_lib_srcs" \
                -v lib_hdrs="$$sorted_lib_hdrs" \
                -v lib_rc="$$win32_lib_rc" \
+               -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \
+               -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \
                -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \
                -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \
                "$$awk_code" $(srcdir)/$(VC6_LIBTMPL) > $(VC6_LIBDSP) || { exit 1; }; \
@@ -432,6 +452,8 @@ function gen_element(type, dir, file)\
                -v lib_srcs="$$sorted_lib_srcs" \
                -v lib_hdrs="$$sorted_lib_hdrs" \
                -v lib_rc="$$win32_lib_rc" \
+               -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \
+               -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \
                -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \
                -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \
                "$$awk_code" $(srcdir)/$(VC7_LIBTMPL) > $(VC7_LIBVCPROJ) || { exit 1; }; \
@@ -450,6 +472,8 @@ function gen_element(type, dir, file)\
                -v lib_srcs="$$sorted_lib_srcs" \
                -v lib_hdrs="$$sorted_lib_hdrs" \
                -v lib_rc="$$win32_lib_rc" \
+               -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \
+               -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \
                -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \
                -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \
                "$$awk_code" $(srcdir)/$(VC71_LIBTMPL) > $(VC71_LIBVCPROJ) || { exit 1; }; \
@@ -468,6 +492,8 @@ function gen_element(type, dir, file)\
                -v lib_srcs="$$sorted_lib_srcs" \
                -v lib_hdrs="$$sorted_lib_hdrs" \
                -v lib_rc="$$win32_lib_rc" \
+               -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \
+               -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \
                -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \
                -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \
                "$$awk_code" $(srcdir)/$(VC8_LIBTMPL) > $(VC8_LIBVCPROJ) || { exit 1; }; \
@@ -486,6 +512,8 @@ function gen_element(type, dir, file)\
                -v lib_srcs="$$sorted_lib_srcs" \
                -v lib_hdrs="$$sorted_lib_hdrs" \
                -v lib_rc="$$win32_lib_rc" \
+               -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \
+               -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \
                -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \
                -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \
                "$$awk_code" $(srcdir)/$(VC9_LIBTMPL) > $(VC9_LIBVCPROJ) || { exit 1; }; \
@@ -504,6 +532,8 @@ function gen_element(type, dir, file)\
                -v lib_srcs="$$sorted_lib_srcs" \
                -v lib_hdrs="$$sorted_lib_hdrs" \
                -v lib_rc="$$win32_lib_rc" \
+               -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \
+               -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \
                -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \
                -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \
                "$$awk_code" $(srcdir)/$(VC10_LIBTMPL) > $(VC10_LIBVCXPROJ) || { exit 1; }; \
@@ -522,6 +552,8 @@ function gen_element(type, dir, file)\
                -v lib_srcs="$$sorted_lib_srcs" \
                -v lib_hdrs="$$sorted_lib_hdrs" \
                -v lib_rc="$$win32_lib_rc" \
+               -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \
+               -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \
                -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \
                -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \
                "$$awk_code" $(srcdir)/$(VC11_LIBTMPL) > $(VC11_LIBVCXPROJ) || { exit 1; }; \
@@ -540,6 +572,8 @@ function gen_element(type, dir, file)\
                -v lib_srcs="$$sorted_lib_srcs" \
                -v lib_hdrs="$$sorted_lib_hdrs" \
                -v lib_rc="$$win32_lib_rc" \
+               -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \
+               -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \
                -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \
                -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \
                "$$awk_code" $(srcdir)/$(VC12_LIBTMPL) > $(VC12_LIBVCXPROJ) || { exit 1; }; \
@@ -558,6 +592,8 @@ function gen_element(type, dir, file)\
                -v lib_srcs="$$sorted_lib_srcs" \
                -v lib_hdrs="$$sorted_lib_hdrs" \
                -v lib_rc="$$win32_lib_rc" \
+               -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \
+               -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \
                -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \
                -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \
                "$$awk_code" $(srcdir)/$(VC14_LIBTMPL) > $(VC14_LIBVCXPROJ) || { exit 1; }; \