Codebase list curl / 9b78b8d
Refresh patches Alessandro Ghedini 5 years ago
5 changed file(s) with 24 addition(s) and 36 deletion(s). Raw diff Collapse all Expand all
+2
-2
debian/patches/04_workaround_as_needed_bug.patch less more
77
88 --- a/ltmain.sh
99 +++ b/ltmain.sh
10 @@ -7360,6 +7360,11 @@
10 @@ -7312,6 +7312,11 @@
1111 arg=$func_stripname_result
1212 ;;
1313
1919 -Wl,*)
2020 func_stripname '-Wl,' '' "$arg"
2121 args=$func_stripname_result
22 @@ -7750,6 +7755,15 @@
22 @@ -7703,6 +7708,15 @@
2323 lib=
2424 found=false
2525 case $deplib in
+1
-1
debian/patches/06_always-disable-valgrind.patch less more
55
66 --- a/tests/Makefile.am
77 +++ b/tests/Makefile.am
8 @@ -67,7 +67,7 @@
8 @@ -68,7 +68,7 @@
99 if CROSSCOMPILING
1010 TEST = @echo "NOTICE: we can't run the tests when cross-compiling!"
1111 else # if not cross-compiling:
+11
-11
debian/patches/07_do-not-disable-debug-symbols.patch less more
77
88 --- a/m4/curl-compilers.m4
99 +++ b/m4/curl-compilers.m4
10 @@ -106,7 +106,6 @@
10 @@ -115,7 +115,6 @@
1111 flags_dbg_all="$flags_dbg_all -gdwarf-2"
1212 flags_dbg_all="$flags_dbg_all -gvms"
1313 flags_dbg_yes="-g"
1515 flags_opt_all="-O -O0 -O1 -O2 -Os -O3 -O4"
1616 flags_opt_yes="-Os"
1717 flags_opt_off="-O0"
18 @@ -130,7 +129,6 @@
18 @@ -139,7 +138,6 @@
1919 compiler_id="DEC_C"
2020 flags_dbg_all="-g -g0 -g1 -g2 -g3"
2121 flags_dbg_yes="-g2"
2323 flags_opt_all="-O -O0 -O1 -O2 -O3 -O4"
2424 flags_opt_yes="-O1"
2525 flags_opt_off="-O0"
26 @@ -166,7 +164,6 @@
26 @@ -175,7 +173,6 @@
2727 flags_dbg_all="$flags_dbg_all -gdwarf-2"
2828 flags_dbg_all="$flags_dbg_all -gvms"
2929 flags_dbg_yes="-g"
3131 flags_opt_all="-O -O0 -O1 -O2 -O3 -Os -Og -Ofast"
3232 flags_opt_yes="-O2"
3333 flags_opt_off="-O0"
34 @@ -211,7 +208,6 @@
34 @@ -220,7 +217,6 @@
3535 compiler_id="IBM_C"
3636 flags_dbg_all="-g -g0 -g1 -g2 -g3"
3737 flags_dbg_yes="-g"
3939 flags_opt_all="-O -O0 -O1 -O2 -O3 -O4 -O5"
4040 flags_opt_all="$flags_opt_all -qnooptimize"
4141 flags_opt_all="$flags_opt_all -qoptimize=0"
42 @@ -245,7 +241,6 @@
42 @@ -254,7 +250,6 @@
4343 compiler_id="INTEL_UNIX_C"
4444 flags_dbg_all="-g -g0"
4545 flags_dbg_yes="-g"
4747 flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
4848 flags_opt_yes="-O2"
4949 flags_opt_off="-O0"
50 @@ -283,7 +278,6 @@
50 @@ -292,7 +287,6 @@
5151 compiler_id="LCC"
5252 flags_dbg_all="-g"
5353 flags_dbg_yes="-g"
5555 flags_opt_all=""
5656 flags_opt_yes=""
5757 flags_opt_off=""
58 @@ -309,7 +303,6 @@
58 @@ -318,7 +312,6 @@
5959 compiler_id="SGI_MIPS_C"
6060 flags_dbg_all="-g -g0 -g1 -g2 -g3"
6161 flags_dbg_yes="-g"
6363 flags_opt_all="-O -O0 -O1 -O2 -O3 -Ofast"
6464 flags_opt_yes="-O2"
6565 flags_opt_off="-O0"
66 @@ -336,7 +329,6 @@
66 @@ -345,7 +338,6 @@
6767 compiler_id="SGI_MIPSPRO_C"
6868 flags_dbg_all="-g -g0 -g1 -g2 -g3"
6969 flags_dbg_yes="-g"
7171 flags_opt_all="-O -O0 -O1 -O2 -O3 -Ofast"
7272 flags_opt_yes="-O2"
7373 flags_opt_off="-O0"
74 @@ -380,7 +372,6 @@
74 @@ -389,7 +381,6 @@
7575 compiler_id="TINY_C"
7676 flags_dbg_all="-g -b"
7777 flags_dbg_yes="-g"
7979 flags_opt_all=""
8080 flags_opt_yes=""
8181 flags_opt_off=""
82 @@ -404,7 +395,6 @@
82 @@ -413,7 +404,6 @@
8383 compiler_id="WATCOM_UNIX_C"
8484 flags_dbg_all="-g1 -g1+ -g2 -g3"
8585 flags_dbg_yes="-g2"
8787 flags_opt_all="-O0 -O1 -O2 -O3"
8888 flags_opt_yes="-O2"
8989 flags_opt_off="-O0"
90 @@ -412,7 +402,6 @@
90 @@ -421,7 +411,6 @@
9191 compiler_id="WATCOM_WINDOWS_C"
9292 flags_dbg_all=""
9393 flags_dbg_yes=""
+5
-11
debian/patches/90_gnutls.patch less more
2020 # This might hold -Werror
2121 --- a/lib/Makefile.am
2222 +++ b/lib/Makefile.am
23 @@ -32,7 +32,7 @@
24 firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl \
25 objnames-test08.sh objnames-test10.sh objnames.inc
23 @@ -31,7 +31,7 @@
24 config-tpf.h mk-ca-bundle.pl mk-ca-bundle.vbs $(CMAKE_DIST) \
25 firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl
2626
2727 -lib_LTLIBRARIES = libcurl.la
2828 +lib_LTLIBRARIES = libcurl-gnutls.la
2929
3030 if BUILD_UNITTESTS
3131 noinst_LTLIBRARIES = libcurlu.la
32 @@ -84,47 +84,47 @@
32 @@ -83,43 +83,43 @@
3333 AM_LDFLAGS =
3434 AM_CFLAGS =
3535
3939 +libcurl_gnutls_la_CPPFLAGS_EXTRA =
4040 +libcurl_gnutls_la_LDFLAGS_EXTRA =
4141 +libcurl_gnutls_la_CFLAGS_EXTRA =
42
43 @CODE_COVERAGE_RULES@
44 -libcurl_la_LDFLAGS_EXTRA += $(CODE_COVERAGE_LDFLAGS)
45 -libcurl_la_CFLAGS_EXTRA += $(CODE_COVERAGE_CFLAGS)
46 +libcurl_gnutls_la_LDFLAGS_EXTRA += $(CODE_COVERAGE_LDFLAGS)
47 +libcurl_gnutls_la_CFLAGS_EXTRA += $(CODE_COVERAGE_CFLAGS)
4842
4943 if CURL_LT_SHLIB_USE_VERSION_INFO
5044 -libcurl_la_LDFLAGS_EXTRA += $(VERSIONINFO)
9387
9488 libcurlu_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_STATICLIB -DUNITTESTS
9589 libcurlu_la_LDFLAGS = $(AM_LDFLAGS) -static $(LIBCURL_LIBS)
96 @@ -133,7 +133,7 @@
90 @@ -128,7 +128,7 @@
9791 # Makefile.inc provides the CSOURCES and HHEADERS defines
9892 include Makefile.inc
9993
+5
-11
debian/patches/99_nss.patch less more
2020 # This might hold -Werror
2121 --- a/lib/Makefile.am
2222 +++ b/lib/Makefile.am
23 @@ -32,7 +32,7 @@
24 firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl \
25 objnames-test08.sh objnames-test10.sh objnames.inc
23 @@ -31,7 +31,7 @@
24 config-tpf.h mk-ca-bundle.pl mk-ca-bundle.vbs $(CMAKE_DIST) \
25 firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl
2626
2727 -lib_LTLIBRARIES = libcurl-gnutls.la
2828 +lib_LTLIBRARIES = libcurl-nss.la
2929
3030 if BUILD_UNITTESTS
3131 noinst_LTLIBRARIES = libcurlu.la
32 @@ -84,47 +84,47 @@
32 @@ -83,43 +83,43 @@
3333 AM_LDFLAGS =
3434 AM_CFLAGS =
3535
3939 +libcurl_nss_la_CPPFLAGS_EXTRA =
4040 +libcurl_nss_la_LDFLAGS_EXTRA =
4141 +libcurl_nss_la_CFLAGS_EXTRA =
42
43 @CODE_COVERAGE_RULES@
44 -libcurl_gnutls_la_LDFLAGS_EXTRA += $(CODE_COVERAGE_LDFLAGS)
45 -libcurl_gnutls_la_CFLAGS_EXTRA += $(CODE_COVERAGE_CFLAGS)
46 +libcurl_nss_la_LDFLAGS_EXTRA += $(CODE_COVERAGE_LDFLAGS)
47 +libcurl_nss_la_CFLAGS_EXTRA += $(CODE_COVERAGE_CFLAGS)
4842
4943 if CURL_LT_SHLIB_USE_VERSION_INFO
5044 -libcurl_gnutls_la_LDFLAGS_EXTRA += $(VERSIONINFO)
9387
9488 libcurlu_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_STATICLIB -DUNITTESTS
9589 libcurlu_la_LDFLAGS = $(AM_LDFLAGS) -static $(LIBCURL_LIBS)
96 @@ -133,7 +133,7 @@
90 @@ -128,7 +128,7 @@
9791 # Makefile.inc provides the CSOURCES and HHEADERS defines
9892 include Makefile.inc
9993