diff --git a/curl/build.sh b/curl/build.sh index 5d10181..978f378 100755 --- a/curl/build.sh +++ b/curl/build.sh @@ -6,14 +6,16 @@ ########################################################### # Check the following 4 variables before running the script topdir=curl -version=7.79.1 +version=7.82.0 pkgver=1 source[0]=http://curl.se/download/$topdir-$version.tar.bz2 # https://curl.se/docs/caextract.html -certdate=2021-09-30 +certdate=2022-03-29 source[1]=https://curl.se/ca/cacert-$certdate.pem # If there are no patches, simply comment this patch[0]=curl-7.68.0-socklen_t.patch +# OpenSSH 8.8 disabled sha1 rsa out of the box +patch[1]=curl-7.82.0-modern-openssh.patch # Source function library . ${BUILDPKG_SCRIPTS}/buildpkg.functions @@ -89,6 +91,7 @@ install() compat curl 7.75.0 1 1 compat curl 7.76.0 1 1 compat curl 7.76.1 1 1 + compat curl 7.79.1 1 1 } reg pack diff --git a/curl/meta/ChangeLog b/curl/meta/ChangeLog index 592c4c3..6569afb 100644 --- a/curl/meta/ChangeLog +++ b/curl/meta/ChangeLog @@ -1,5 +1,9 @@ CHANGELOG --------- +* Sat Apr 09 2022 Tom G. Christensen - 7.82.0-1 +- Update to 7.82.0 +- Update CA bundle to 2022-03-29 + * Sat Oct 02 2021 Tom G. Christensen - 7.79.1-1 - Update to 7.79.1 - Update CA bundle to 2021-09-30 diff --git a/curl/src/curl-7.82.0-modern-openssh.patch b/curl/src/curl-7.82.0-modern-openssh.patch new file mode 100644 index 0000000..fbd0306 --- /dev/null +++ b/curl/src/curl-7.82.0-modern-openssh.patch @@ -0,0 +1,11 @@ +--- curl-7.79.1/tests/sshserver.pl.rsa 2021-09-17 09:45:57.000000000 +0000 ++++ curl-7.79.1/tests/sshserver.pl 2022-04-09 14:01:28.060010000 +0000 +@@ -570,6 +570,8 @@ + push @cfgarr, 'SyslogFacility AUTH'; + push @cfgarr, 'UseLogin no'; + push @cfgarr, 'X11Forwarding no'; ++push @cfgarr, 'HostKeyAlgorithms +ssh-rsa'; ++push @cfgarr, 'PubkeyAcceptedAlgorithms +ssh-rsa'; + push @cfgarr, '#'; + +