From 308ffc60bc2efb40ed8356b46ba48b51e866f9a4 Mon Sep 17 00:00:00 2001 From: Tomas Hozza Date: Mon, 22 Jul 2013 09:27:32 +0200 Subject: [PATCH] provide man page for unbound-streamtcp Signed-off-by: Tomas Hozza --- unbound-1.4.20-streamtcp-manpage.patch | 86 ++++++++++++++++++++++++++ unbound.spec | 9 ++- 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 unbound-1.4.20-streamtcp-manpage.patch diff --git a/unbound-1.4.20-streamtcp-manpage.patch b/unbound-1.4.20-streamtcp-manpage.patch new file mode 100644 index 0000000..888c706 --- /dev/null +++ b/unbound-1.4.20-streamtcp-manpage.patch @@ -0,0 +1,86 @@ +From 2af92efb1f128ef43313e890182ff23e94276dca Mon Sep 17 00:00:00 2001 +From: wouter +Date: Fri, 19 Jul 2013 10:46:16 +0000 +Subject: [PATCH] - streamtcp man page, contributed by Tomas Hozza. + +git-svn-id: http://unbound.nlnetlabs.nl/svn/trunk@2924 be551aaa-1e26-0410-a405-d3ace91eadb9 +--- + testcode/streamtcp.1 | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 66 insertions(+) + create mode 100644 testcode/streamtcp.1 + +diff --git a/testcode/streamtcp.1 b/testcode/streamtcp.1 +new file mode 100644 +index 0000000..7c738d9 +--- /dev/null ++++ b/testcode/streamtcp.1 +@@ -0,0 +1,66 @@ ++.TH "unbound\-streamtcp" "1" "Mar 21, 2013" "NLnet Labs" "unbound" ++.\" ++.\" unbound-streamtcp.1 -- unbound DNS lookup utility ++.\" ++.SH "NAME" ++.LP ++.B unbound\-streamtcp ++\- unbound DNS lookup utility ++.SH "SYNOPSIS" ++.LP ++.B unbound\-streamtcp ++.RB [ \-unsh ] ++.RB [ \-f ++.IR ipaddr[@port] ] ++.I name ++.I type ++.I class ++.SH "DESCRIPTION" ++.LP ++.B unbound\-streamtcp ++sends a DNS Query of the given \fBtype\fR and \fBclass\fR for the given \fBname\fR ++to the DNS server over TCP and displays the response. ++.P ++If the server to query is not given using the \fB\-f\fR option then localhost ++(127.0.0.1) is used. More queries can be given on one commandline, they ++are resolved in sequence. ++.P ++The available options are: ++.TP ++.I name ++This name is resolved (looked up in the DNS). ++.TP ++.I type ++Specify the type of data to lookup. ++.TP ++.I class ++Specify the class to lookup for. ++.TP ++.B \-u ++Use UDP instead of TCP. No retries are attempted. ++.TP ++.B \-n ++Do not wait for the answer. ++.TP ++.B \-s ++Use SSL. ++.TP ++.B \-h ++Print program usage. ++.TP ++.B \-f \fIipaddr[@port] ++Specify the server to send the queries to. If not specified localhost (127.0.0.1) is used. ++.SH "EXAMPLES" ++.LP ++Some examples of use. ++.P ++$ unbound\-streamtcp www.example.com A IN ++.P ++$ unbound\-streamtcp \-f 192.168.1.1 www.example.com SOA IN ++.P ++$ unbound\-streamtcp \-f 192.168.1.1@1234 153.1.168.192.in\-addr.arpa. PTR IN ++.SH "EXIT CODE" ++The unbound\-streamtcp program exits with status code 1 on error, ++0 on no error. ++.SH "AUTHOR" ++This manual page was written by Tomas Hozza . +-- +1.8.3.1 + diff --git a/unbound.spec b/unbound.spec index 36507c1..e7dcd69 100644 --- a/unbound.spec +++ b/unbound.spec @@ -11,7 +11,7 @@ Summary: Validating, recursive, and caching DNS(SEC) resolver Name: unbound Version: 1.4.20 -Release: 15%{?dist} +Release: 16%{?dist} License: BSD Url: http://www.nlnetlabs.nl/unbound/ Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz @@ -33,6 +33,7 @@ Source14: unbound.sysconfig Source15: unbound.cron Source16: unbound-munin.README Patch1: unbound-1.4.20-roundrobin.patch +Patch2: unbound-1.4.20-streamtcp-manpage.patch Group: System Environment/Daemons BuildRequires: flex, openssl-devel , ldns-devel >= 1.6.13 @@ -107,6 +108,7 @@ Python modules and extensions for unbound %prep %setup -q %patch1 -p1 +%patch2 -p1 %build export LDFLAGS="-Wl,-z,relro,-z,now -pie -specs=/usr/lib/rpm/redhat/redhat-hardened-ld" @@ -149,6 +151,8 @@ done # install streamtcp used for monitoring / debugging unbound's port 80/443 modes install -m 0755 streamtcp %{buildroot}%{_sbindir}/unbound-streamtcp +# install streamtcp man page +install -m 0644 testcode/streamtcp.1 %{buildroot}/%{_mandir}/man1/unbound-streamtcp.1 # Install tmpfiles.d config install -d -m 0755 %{buildroot}%{_sysconfdir}/tmpfiles.d/ %{buildroot}%{_sharedstatedir}/unbound @@ -277,6 +281,9 @@ exit 0 /bin/systemctl try-restart unbound-keygen.service >/dev/null 2>&1 || : %changelog +* Mon Jul 22 2013 Tomas Hozza - 1.4.20-16 +- provide man page for unbound-streamtcp + * Mon Jul 08 2013 Paul Wouters - 1.4.20-15 - Re-introduce hardening flags for full relro and pie - Fixes compilation failure for python module