diff --git a/curl.spec b/curl.spec index 79a490b..221e624 100644 --- a/curl.spec +++ b/curl.spec @@ -6,6 +6,7 @@ License: MIT Group: Applications/Internet Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma Source2: curlbuild.h +Source3: https://raw.githubusercontent.com/bagder/curl/curl-7_41_0/tests/extern-scan.pl # fix defects found by Coverity and ShellCheck Patch1: 0001-curl-7.41.0-abe54705.patch @@ -119,6 +120,7 @@ documentation of the library, too. %prep %setup -q +install -m0755 %{SOURCE3} tests/ # upstream patches %patch1 -p1 @@ -246,6 +248,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Wed Feb 25 2015 Kamil Dudka 7.41.0-1 - new upstream release +- include extern-scan.pl to make test1135 succeed (upstream commit 1514b718) * Mon Feb 23 2015 Kamil Dudka 7.40.0-3 - fix a spurious connect failure on dual-stacked hosts (#1187531) diff --git a/extern-scan.pl b/extern-scan.pl new file mode 100644 index 0000000..49d0c86 --- /dev/null +++ b/extern-scan.pl @@ -0,0 +1,60 @@ +#!/usr/bin/env perl +#*************************************************************************** +# _ _ ____ _ +# Project ___| | | | _ \| | +# / __| | | | |_) | | +# | (__| |_| | _ <| |___ +# \___|\___/|_| \_\_____| +# +# Copyright (C) 2010-2015, 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 http://curl.haxx.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. +# +########################################################################### +# +# + +use strict; +use warnings; + +# we may get the dir root pointed out +my $root=$ARGV[0] || "."; + +my @incs = ( + "$root/include/curl/curl.h", + "$root/include/curl/easy.h", + "$root/include/curl/mprintf.h", + "$root/include/curl/multi.h", + ); + +my $verbose=0; +my $summary=0; +my $misses=0; + +my @syms; +my %doc; +my %rem; + +sub scanheader { + my ($f)=@_; + open H, "<$f" || die; + while() { + if (/^(CURL_EXTERN.*)/) { + print "$1\n"; + } + } + close H; +} + +foreach my $i (@incs) { + scanheader($i); +}