diff --git a/curl-8.4.0.tar.xz b/curl-8.4.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..5f555058a7ea9a7ab106443156019f4913a11dd4 Binary files /dev/null and b/curl-8.4.0.tar.xz differ diff --git a/curl-8.5.0.tar.xz b/curl-8.5.0.tar.xz deleted file mode 100644 index 6e807c98ab011b4f8cf4eefca949fc36c0f7dcf8..0000000000000000000000000000000000000000 Binary files a/curl-8.5.0.tar.xz and /dev/null differ diff --git a/curl.spec b/curl.spec index 91056c45b6e0cfb6a5e0049e4be34c675c46ea8c..e4415c7a421575179f82dff201033a9aae1e3587 100644 --- a/curl.spec +++ b/curl.spec @@ -1,11 +1,11 @@ %define anolis_release 1 Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl -Version: 8.5.0 +Epoch: 1 +Version: 8.4.0 Release: %{anolis_release}%{?dist} License: MIT Source0: https://curl.se/download/%{name}-%{version}.tar.xz -Source1: https://raw.githubusercontent.com/curl/curl/curl-8_5_0/tests/errorcodes.pl # Upstream patch @@ -164,7 +164,6 @@ Doc files for curl %prep %autosetup -p1 -cp %{SOURCE1} tests/ # upstream patches @@ -366,6 +365,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/fish %doc docs/TheArtOfHttpScripting.md %changelog +* Mon Mar 25 2024 Zhenyu Wang - 8.4.0-1 +- Fallback version to 8.4.0 + * Thu Dec 07 2023 Funda Wang - 8.5.0-1 - New version 8.5.0 - Add forgotten errorcodes.pl (upstream issue#12462) diff --git a/errorcodes.pl b/errorcodes.pl deleted file mode 100644 index 9c8f9e882ddb018f4eeefa47f0389f581739ef72..0000000000000000000000000000000000000000 --- a/errorcodes.pl +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/env perl -#*************************************************************************** -# _ _ ____ _ -# Project ___| | | | _ \| | -# / __| | | | |_) | | -# | (__| |_| | _ <| |___ -# \___|\___/|_| \_\_____| -# -# Copyright (C) Daniel Stenberg, , et al. -# -# This software is licensed as described in the file COPYING, which -# you should have received as part of this distribution. The terms -# are also available at https://curl.se/docs/copyright.html. -# -# You may opt to use, copy, modify, merge, publish, distribute and/or sell -# copies of the Software, and permit persons to whom the Software is -# furnished to do so, under the terms of the COPYING file. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# -# SPDX-License-Identifier: curl -# -########################################################################### - -# Check that libcurl-errors.3 and the public header files have the same set of -# error codes. - -use strict; -use warnings; - -# we may get the dir roots pointed out -my $root=$ARGV[0] || "."; -my $manpge = "$root/docs/libcurl/libcurl-errors.3"; -my $curlh = "$root/include/curl"; -my $errors=0; - -my @hnames; -my %wherefrom; -my @mnames; -my %manfrom; - -sub scanheader { - my ($file)=@_; - open H, "<$file"; - my $line = 0; - while() { - $line++; - if($_ =~ /^ (CURL(E|UE|SHE|HE|M)_[A-Z0-9_]*)/) { - my ($name)=($1); - if(($name !~ /OBSOLETE/) && ($name !~ /_LAST\z/)) { - push @hnames, $name; - if($wherefrom{$name}) { - print STDERR "double: $name\n"; - } - $wherefrom{$name}="$file:$line"; - } - } - } - close(H); -} - -sub scanmanpage { - my ($file)=@_; - open H, "<$file"; - my $line = 0; - while() { - $line++; - if($_ =~ /^\.IP \"(CURL(E|UE|SHE|HE|M)_[A-Z0-9_]*)/) { - my ($name)=($1); - push @mnames, $name; - $manfrom{$name}="$file:$line"; - } - } - close(H); -} - - -opendir(my $dh, $curlh) || die "Can't opendir $curlh: $!"; -my @hfiles = grep { /\.h$/ } readdir($dh); -closedir $dh; - -for(sort @hfiles) { - scanheader("$curlh/$_"); -} -scanmanpage($manpge); - -print "Result\n"; -for my $h (sort @hnames) { - if(!$manfrom{$h}) { - printf "$h from %s, not in man page\n", $wherefrom{$h}; - } -} - -for my $m (sort @mnames) { - if(!$wherefrom{$m}) { - printf "$m from %s, not in any header\n", $manfrom{$m}; - } -}