Attachment 167790 Details for Bug 207760 – upstream patch for unbound-control-setup

[patch] upstream patch for unbound-control-setup

unbound.diff (text/plain), 2.95 KB, created by Franco Fichtner on 2016-03-07 06:18:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Franco Fichtner

Created: 2016-03-07 06:18:53 UTC

Size: 2.95 KB

patch

obsolete

>diff --git a/dns/unbound/Makefile b/dns/unbound/Makefile
>index ef4da5b..f48cdd1 100644
>--- a/dns/unbound/Makefile
>+++ b/dns/unbound/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	unbound
> PORTVERSION=	1.5.7
>+PORTREVISION=	1
> CATEGORIES=	dns
> MASTER_SITES=	http://unbound.net/downloads/
> 
>diff --git a/dns/unbound/files/patch-upstream-r3587 b/dns/unbound/files/patch-upstream-r3587
>new file mode 100644
>index 0000000..a2ee171
>--- /dev/null
>+++ b/dns/unbound/files/patch-upstream-r3587
>@@ -0,0 +1,60 @@
>+From 6ae738d0d86f6d7cccce19f315105ab7e0e33c13 Mon Sep 17 00:00:00 2001
>+From: ralph <ralph@be551aaa-1e26-0410-a405-d3ace91eadb9>
>+Date: Tue, 15 Dec 2015 11:00:59 +0000
>+Subject: [PATCH] Fix #729: omit use of escape sequences in echo since they are
>+ not portable (unbound-control-setup)
>+
>+git-svn-id: http://unbound.nlnetlabs.nl/svn/trunk@3587 be551aaa-1e26-0410-a405-d3ace91eadb9
>+---
>+ doc/Changelog                        |  4 ++++
>+ smallapp/unbound-control-setup.sh.in | 30 +++++++++++++++---------------
>+ 2 files changed, 19 insertions(+), 15 deletions(-)
>+
>+diff --git a/smallapp/unbound-control-setup.sh.in b/smallapp/unbound-control-setup.sh.in
>+index f99d7bc..0d759f4 100644
>+--- smallapp/unbound-control-setup.sh.in
>++++ smallapp/unbound-control-setup.sh.in
>+@@ -107,14 +107,14 @@ else
>+ fi
>+ 
>+ # create self-signed cert for server
>+-echo "[req]\n" > request.cfg
>+-echo "default_bits=$BITS\n" >> request.cfg
>+-echo "default_md=$HASH\n" >> request.cfg
>+-echo "prompt=no\n" >> request.cfg
>+-echo "distinguished_name=req_distinguished_name\n" >> request.cfg
>+-echo "\n" >> request.cfg
>+-echo "[req_distinguished_name]\n" >> request.cfg
>+-echo "commonName=$SERVERNAME\n" >> request.cfg
>++echo "[req]" > request.cfg
>++echo "default_bits=$BITS" >> request.cfg
>++echo "default_md=$HASH" >> request.cfg
>++echo "prompt=no" >> request.cfg
>++echo "distinguished_name=req_distinguished_name" >> request.cfg
>++echo "" >> request.cfg
>++echo "[req_distinguished_name]" >> request.cfg
>++echo "commonName=$SERVERNAME" >> request.cfg
>+ 
>+ test -f request.cfg || error "could not create request.cfg"
>+ 
>+@@ -124,13 +124,13 @@ openssl req -key $SVR_BASE.key -config request.cfg  -new -x509 -days $DAYS -out
>+ openssl x509 -in $SVR_BASE.pem -addtrust serverAuth -out $SVR_BASE"_trust.pem"
>+ 
>+ # create client request and sign it, piped
>+-echo "[req]\n" > request.cfg
>+-echo "default_bits=$BITS\n" >> request.cfg
>+-echo "default_md=$HASH\n" >> request.cfg
>+-echo "prompt=no\n" >> request.cfg
>+-echo "distinguished_name=req_distinguished_name\n" >> request.cfg
>+-echo "\n" >> request.cfg
>+-echo "[req_distinguished_name]\n" >> request.cfg
>++echo "[req]" > request.cfg
>++echo "default_bits=$BITS" >> request.cfg
>++echo "default_md=$HASH" >> request.cfg
>++echo "prompt=no" >> request.cfg
>++echo "distinguished_name=req_distinguished_name" >> request.cfg
>++echo "" >> request.cfg
>++echo "[req_distinguished_name]" >> request.cfg
>+ echo "commonName=$CLIENTNAME" >> request.cfg
>+ 
>+ test -f request.cfg || error "could not create request.cfg"

Actions: View | Diff

Attachments on bug 207760: 167790