diff --git a/curl/build.sh b/curl/build.sh index 7da2f88..b1cde18 100755 --- a/curl/build.sh +++ b/curl/build.sh @@ -6,14 +6,14 @@ ########################################################### # Check the following 4 variables before running the script topdir=curl -version=7.64.1 +version=7.69.1 pkgver=1 source[0]=http://curl.haxx.se/download/$topdir-$version.tar.bz2 # https://curl.haxx.se/docs/caextract.html -certdate=2019-01-23 +certdate=2020-01-01 source[1]=https://curl.haxx.se/ca/cacert-$certdate.pem # If there are no patches, simply comment this -patch[0]=curl-7.59.0-socklen_t.patch +patch[0]=curl-7.68.0-socklen_t.patch # Source function library . ${BUILDPKG_SCRIPTS}/buildpkg.functions @@ -58,7 +58,7 @@ install() generic_install DESTDIR ${__install} -m0644 -D $(get_source_absfilename "${source[1]}") ${stagedir}${prefix}/${_sysconfdir}/curl-ca-bundle.pem doc CHANGES COPYING README* RELEASE-NOTES docs/FAQ docs/FEATURES docs/BUGS \ - docs/MANUAL docs/RESOURCES docs/TODO docs/TheArtOfHttpScripting \ + docs/RESOURCES docs/TODO docs/TheArtOfHttpScripting \ docs/examples/*.c docs/examples/Makefile.example # ABI compatible releases @@ -86,6 +86,7 @@ install() compat curl 7.59.0 1 1 compat curl 7.61.1 1 1 compat curl 7.64.0 1 1 + compat curl 7.64.1 1 1 } reg pack diff --git a/curl/meta/ChangeLog b/curl/meta/ChangeLog index 88d1115..6a43100 100644 --- a/curl/meta/ChangeLog +++ b/curl/meta/ChangeLog @@ -1,5 +1,12 @@ CHANGELOG --------- +* Sat Mar 21 2020 Tom G. Christensen - 7.69.1-1 +- Update to 7.69.1 + +* Thu Jan 30 2020 Tom G. Christensen - 7.68.0-1 +- Update to 7.68.0 +- Update CA bundle to 2020-01-01 + * Thu Apr 04 2019 Tom G. Christensen - 7.64.1-1 - Update to 7.64.1 diff --git a/curl/src/curl-7.59.0-socklen_t.patch b/curl/src/curl-7.68.0-socklen_t.patch similarity index 60% rename from curl/src/curl-7.59.0-socklen_t.patch rename to curl/src/curl-7.68.0-socklen_t.patch index 38b8643..a3579ef 100644 --- a/curl/src/curl-7.59.0-socklen_t.patch +++ b/curl/src/curl-7.68.0-socklen_t.patch @@ -1,6 +1,6 @@ ---- curl-7.59.0/include/curl/system.h.socklen_t 2018-01-30 23:02:52.000000000 +0100 -+++ curl-7.59.0/include/curl/system.h 2018-04-08 17:44:33.797554000 +0200 -@@ -365,7 +365,7 @@ +--- curl-7.68.0/include/curl/system.h.orig 2020-01-04 22:41:58.000000000 +0000 ++++ curl-7.68.0/include/curl/system.h 2020-01-30 18:17:53.804852000 +0000 +@@ -396,7 +396,7 @@ # define CURL_SUFFIX_CURL_OFF_T L # define CURL_SUFFIX_CURL_OFF_TU UL # endif