ldns: Update from 1.6.17 to 1.7.0
This commit is contained in:
Fredrik Fornwall
parent
193cf45374
commit
52192d2e5e
|
|
@ -1,8 +1,12 @@
|
|||
TERMUX_PKG_HOMEPAGE=http://www.nlnetlabs.nl/projects/ldns/
|
||||
TERMUX_PKG_DESCRIPTION="Library for simplifying DNS programming and supporting recent and experimental RFCs"
|
||||
TERMUX_PKG_DEPENDS="openssl"
|
||||
TERMUX_PKG_VERSION=1.6.17
|
||||
TERMUX_PKG_VERSION=1.7.0
|
||||
TERMUX_PKG_SRCURL=http://www.nlnetlabs.nl/downloads/ldns/ldns-${TERMUX_PKG_VERSION}.tar.gz
|
||||
TERMUX_PKG_SHA256=8b88e059452118e8949a2752a55ce59bc71fa5bc414103e17f5b6b06f9bcc8cd
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-ssl=$TERMUX_PREFIX"
|
||||
TERMUX_PKG_SHA256=c19f5b1b4fb374cfe34f4845ea11b1e0551ddc67803bd6ddd5d2a20f0997a6cc
|
||||
# --disable-dane-verify needed until openssl 1.1.0:
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||
--with-ssl=$TERMUX_PREFIX
|
||||
--disable-dane-verify
|
||||
"
|
||||
TERMUX_PKG_RM_AFTER_INSTALL="bin/ldns-config share/man/man1/ldns-config.1"
|
||||
|
|
|
|||
|
|
@ -1,105 +0,0 @@
|
|||
Patch allowing building with perl 5.22.
|
||||
|
||||
Will be included in the next ldns release:
|
||||
http://git.nlnetlabs.nl/ldns/commit/?h=develop&id=168ee09a
|
||||
|
||||
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);
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
TERMUX_PKG_HOMEPAGE=http://www.openssh.com/
|
||||
TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine"
|
||||
TERMUX_PKG_VERSION=7.4p1
|
||||
TERMUX_PKG_REVISION=1
|
||||
TERMUX_PKG_SRCURL=http://mirrors.evowise.com/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}.tar.gz
|
||||
TERMUX_PKG_SHA256=1b1fc4a14e2024293181924ed24872e6f2e06293f3e8926a376b8aec481f19d1
|
||||
TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl, libutil"
|
||||
|
|
|
|||
Loading…
Reference in New Issue