diff options
author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2017-06-03 15:12:53 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-06-05 11:55:17 +0200 |
commit | 7d2c135b9406b9ce3b83597ec0f3329413da5521 (patch) | |
tree | 158bd6b51bcf630db86e682ccb125f4faa51c3c0 /package/libldns/0003-let-doxyparse-output-manpage-generation-issues.patch | |
parent | 89b02b444f1bc9899584d9ccc9ee207bba8452f4 (diff) | |
download | buildroot-7d2c135b9406b9ce3b83597ec0f3329413da5521.tar.gz buildroot-7d2c135b9406b9ce3b83597ec0f3329413da5521.zip |
package/libldns: bump version to 1.7.0
Commit https://git.nlnetlabs.nl/ldns/commit/host2str.c?id=f7b3a9700e91f8e46477f335c5aaac7c6cdd8acb
added compatability with openssl 1.1.0 but, at the same time, breaks
build without openssl:
./host2str.c:1934:74: error: unknown type name ‘BIGNUM’
ldns_print_bignum_b64_line(ldns_buffer* output, const char* label, const BIGNUM* num)
This bump makes openssl a mandatory dependency to circumvent the
problem, we do not gain much by leaving out crypto support in a
sensitive area like dns. The only package using libldns, freeswitch,
selects openssl as well, so we have no use case for having libldns
without openssl support.
--disable-dane-verify is needed until we bump our openssl to 1.1.x.,
this fixes the following configure error:
checking for SSL_get0_dane... no
configure: error: OpenSSL does not support offline DANE verification
(Needed for the DANE-TA usage type). Please upgrade OpenSSL to version
>= 1.1.0 or rerun with --disable-dane-verify or --disable-dane-ta-usage
Removed patches applied upstream:
0001-bugfix-548-Double-free-for-answers-4096.patch
https://git.nlnetlabs.nl/ldns/commit/?h=release-1.7.x&id=2853eb352b4461e98f2926ace4ea3810cedf4167
0002-whitespace-bug-in-ldns-read-zone.patch
https://git.nlnetlabs.nl/ldns/commit/?h=release-1.7.x&id=d6037a22fbedb8ef3a22de4107e4eaa36840865b
0003-let-doxyparse-output-manpage-generation-issues.patch
https://git.nlnetlabs.nl/ldns/commit/?h=release-1.7.x&id=168ee09a4bf184947798c3ee3ac99b6651470d64
0004-Comment-out-debugging-remnants.patch
https://git.nlnetlabs.nl/ldns/commit/?h=release-1.7.x&id=a0a943d504debb05ce4d62ea81c2d218a6cc8727
0005-Remove-manpage-content-nondeterminicity-warnings.patch
https://git.nlnetlabs.nl/ldns/commit/?h=release-1.7.x&id=a56e48856d519d12f1ef600848f335615467f147
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/libldns/0003-let-doxyparse-output-manpage-generation-issues.patch')
-rw-r--r-- | package/libldns/0003-let-doxyparse-output-manpage-generation-issues.patch | 116 |
1 files changed, 0 insertions, 116 deletions
diff --git a/package/libldns/0003-let-doxyparse-output-manpage-generation-issues.patch b/package/libldns/0003-let-doxyparse-output-manpage-generation-issues.patch deleted file mode 100644 index 223ebe98b3..0000000000 --- a/package/libldns/0003-let-doxyparse-output-manpage-generation-issues.patch +++ /dev/null @@ -1,116 +0,0 @@ -From d8a3da12be085fbc92e3d4d4d084c328fc37485a Mon Sep 17 00:00:00 2001 -From: Willem Toorop <willem@nlnetlabs.nl> -Date: Thu, 27 Nov 2014 16:21:54 +0100 -Subject: [PATCH] let doxyparse output manpage generation issues - -[Backport from upstream commit -168ee09a4bf184947798c3ee3ac99b6651470d64, fixes the build with Perl -5.22.] -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> ---- - doc/doxyparse.pl | 45 ++++++++++++++++++++++++++++++++++++++------- - 1 file changed, 38 insertions(+), 7 deletions(-) - -diff --git a/doc/doxyparse.pl b/doc/doxyparse.pl -index 96a1732..a09b2e8 100755 ---- a/doc/doxyparse.pl -+++ b/doc/doxyparse.pl -@@ -57,10 +57,15 @@ This manpage was automaticly generated from the ldns source code by - use of Doxygen and some perl. - "; - --getopts("m:",\%options); -+getopts("em:",\%options); - # if -m manpage file is given process that file - # parse the file which tells us what manpages go together - my $functions, $see_also; -+my $i = -1; -+my $report_errors = defined $options{'e'}; -+my $errors = 0; -+my %unique; -+ - if (defined $options{'m'}) { - # process - open(MAN, "<$options{'m'}") or die "Cannot open $options{'m'}"; -@@ -68,18 +73,35 @@ if (defined $options{'m'}) { - # func1, func2, .. | see_also1, see_also2, ... - while(<MAN>) { - chomp; -+ $i += 1; - if (/^#/) { next; } - if (/^$/) { next; } -- ($functions, $see_also) = split /[\t ]*\|[\t ]*/, $_; -- #print "{$functions}\n"; -- #print "{$see_also}\n"; -+ my @parts = split /[\t ]*\|[\t ]*/, $_; -+ $functions = shift @parts; -+ $see_also = join ', ', @parts; -+ print "{$functions}\n"; -+ print "{$see_also}\n"; - my @funcs = split /[\t ]*,[\t ]*/, $functions; - my @also = split /[\t ]*,[\t ]*/, $see_also; - $manpages{$funcs[0]} = \@funcs; - $see_also{$funcs[0]} = \@also; -+ foreach (@funcs) { -+ if ($unique{$_}) { -+ push $unique{$_}, ($i,); -+ } else { -+ $unique{$_} = [$i]; -+ } -+ } - #print "[", $funcs[0], "]\n"; - } - close(MAN); -+ while (($func, $lines) = each %unique ) { -+ if (scalar @$lines > 1) { -+ print STDERR "$func in function_manpages on lines: " -+ . join(", ",@$lines) . "\n" if $report_errors; -+ $errors += 1; -+ } -+ } - } else { - print "Need -m file to process the .h files\n"; - exit 1; -@@ -95,7 +117,7 @@ mkdir "doc/man"; - mkdir "doc/man/man$MAN_SECTION"; - - $state = 0; --my $i; -+$i = 0; - my @lines = <STDIN>; - my $max = @lines; - -@@ -273,7 +295,7 @@ foreach (keys %manpages) { - - print MAN $MAN_MIDDLE; - -- if (defined(@$also)) { -+ if (@$also) { - print MAN "\n.SH SEE ALSO\n\\fI"; - print MAN join "\\fR, \\fI", @$also; - print MAN "\\fR.\nAnd "; -@@ -290,7 +312,7 @@ foreach (keys %manpages) { - # create symlinks - chdir("$BASE/man$MAN_SECTION"); - foreach (@$name) { -- print STDERR $_,"\n"; -+ print STDOUT $_,"\n"; - my $new_file = $_ . "." . $MAN_SECTION; - if ($new_file eq $symlink_file) { - next; -@@ -301,3 +323,12 @@ foreach (keys %manpages) { - chdir("../../.."); # and back, tricky and fragile... - close(MAN); - } -+foreach (keys %api) { -+ next if (/ / || /^$/); -+ if (not $unique{$_}) { -+ print STDERR "no man page for $_\n" if $report_errors; -+ $errors += 1; -+ } -+} -+ -+exit ($report_errors and $errors != 0); --- -2.6.4 - |