From 904a2a0e779c3f39b11704539155456aa20d1383 Mon Sep 17 00:00:00 2001 From: T3slider Date: Thu, 9 Jul 2015 06:52:01 +0700 Subject: network/dnscrypt-wrapper: Updated for version 0.1.17. Signed-off-by: Willy Sudiarto Raharjo --- network/dnscrypt-wrapper/dnscrypt-wrapper.8 | 71 +++++++++++----------- .../dnscrypt-wrapper/dnscrypt-wrapper.SlackBuild | 4 +- network/dnscrypt-wrapper/dnscrypt-wrapper.default | 9 ++- network/dnscrypt-wrapper/dnscrypt-wrapper.info | 10 +-- network/dnscrypt-wrapper/rc.dnscrypt-wrapper | 12 +--- 5 files changed, 47 insertions(+), 59 deletions(-) (limited to 'network') diff --git a/network/dnscrypt-wrapper/dnscrypt-wrapper.8 b/network/dnscrypt-wrapper/dnscrypt-wrapper.8 index 0988f49dc2..8f800106b1 100644 --- a/network/dnscrypt-wrapper/dnscrypt-wrapper.8 +++ b/network/dnscrypt-wrapper/dnscrypt-wrapper.8 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.43.3. -.TH DNSCRYPT-WRAPPER "8" "June 2015" "dnscrypt-wrapper 0.1.16" "System Administration Utilities" +.TH DNSCRYPT-WRAPPER "8" "July 2015" "dnscrypt-wrapper 0.1.17" "System Administration Utilities" .SH NAME dnscrypt-wrapper \- A server-side DNSCrypt proxy that adds DNSCrypt support to any name resolver. .SH SYNOPSIS @@ -10,59 +10,56 @@ dnscrypt-wrapper \- A server-side DNSCrypt proxy that adds DNSCrypt support to a \fB\-h\fR, \fB\-\-help\fR show this help message and exit .TP -\fB\-v\fR, \fB\-\-version\fR -show version info -.TP -\fB\-a\fR, \fB\-\-listen\-address=\fR -local address to listen (default: 0.0.0.0:53) -.TP -\fB\-r\fR, \fB\-\-resolver\-address=\fR -upstream dns resolver server () -.TP -\fB\-u\fR, \fB\-\-user=\fR -run as given user -.TP \fB\-d\fR, \fB\-\-daemonize\fR run as daemon (default: off) .TP -\fB\-p\fR, \fB\-\-pidfile=\fR -pid stored file +\fB\-\-cert\-file\-expire\-days=\fR +cert file expire days (default: 365) .TP -\fB\-U\fR, \fB\-\-unauthenticated\fR -allow and forward unauthenticated queries (default: off) +\fB\-\-crypt\-secretkey\-file=\fR +crypt secret key file (default: ./crypt_secret.key) .TP -\fB\-V\fR, \fB\-\-verbose\fR -show verbose logs (specify more \fB\-VVV\fR to increase verbosity) +\fB\-\-gen\-cert\-file\fR +generate pre\-signed certificate .TP -\fB\-l\fR, \fB\-\-logfile=\fR -log file path (default: stdout) +\fB\-\-gen\-crypt\-keypair\fR +generate crypt key pair .TP \fB\-\-gen\-provider\-keypair\fR generate provider key pair .TP -\fB\-\-crypt\-publickey\-file=\fR -crypt public key file +\fB\-a\fR, \fB\-\-listen\-address=\fR +local address to listen (default: 0.0.0.0:53) .TP -\fB\-\-crypt\-secretkey\-file=\fR -crypt secret key file +\fB\-l\fR, \fB\-\-logfile=\fR +log file path (default: stdout) .TP -\fB\-\-gen\-crypt\-keypair\fR -generate crypt key pair +\fB\-p\fR, \fB\-\-pidfile=\fR +pid stored file +.TP +\fB\-\-provider\-cert\-file=\fR +certificate file (default: ./dnscrypt.cert) +.TP +\fB\-\-provider\-name=\fR +provider name .TP \fB\-\-provider\-publickey\-file=\fR -provider public key file +provider public key file (default: ./public.key) .TP \fB\-\-provider\-secretkey\-file=\fR -provider secret key file +provider secret key file (default: ./secret.key) .TP -\fB\-\-gen\-cert\-file\fR -generate pre\-signed certificate +\fB\-r\fR, \fB\-\-resolver\-address=\fR +upstream dns resolver server () .TP -\fB\-\-cert\-file\-expire\-days=\fR -cert file expire days (default: 365) +\fB\-U\fR, \fB\-\-unauthenticated\fR +allow and forward unauthenticated queries (default: off) .TP -\fB\-\-provider\-name=\fR -provider name +\fB\-u\fR, \fB\-\-user=\fR +run as given user .TP -\fB\-\-provider\-cert\-file=\fR -use this to self\-serve cert file +\fB\-V\fR, \fB\-\-verbose\fR +show verbose logs (specify more \fB\-VVV\fR to increase verbosity) +.TP +\fB\-v\fR, \fB\-\-version\fR +show version info diff --git a/network/dnscrypt-wrapper/dnscrypt-wrapper.SlackBuild b/network/dnscrypt-wrapper/dnscrypt-wrapper.SlackBuild index 4f9b771c3a..a22ea80be0 100644 --- a/network/dnscrypt-wrapper/dnscrypt-wrapper.SlackBuild +++ b/network/dnscrypt-wrapper/dnscrypt-wrapper.SlackBuild @@ -26,7 +26,7 @@ # suggestion. PRGNAM=dnscrypt-wrapper -VERSION=${VERSION:-0.1.16} +VERSION=${VERSION:-0.1.17} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -58,7 +58,7 @@ else fi # argparse is a git submodule required for building... -ARGPARSEVERSION=${ARGPARSEVERSION:-2f310edc35e5adacaf738ccb9d73d9c23f4e38b1} +ARGPARSEVERSION=${ARGPARSEVERSION:-e1277bf1e3f47663fad54f84ca723db7688630d4} set -e diff --git a/network/dnscrypt-wrapper/dnscrypt-wrapper.default b/network/dnscrypt-wrapper/dnscrypt-wrapper.default index f3e381be98..2d3a85bad3 100644 --- a/network/dnscrypt-wrapper/dnscrypt-wrapper.default +++ b/network/dnscrypt-wrapper/dnscrypt-wrapper.default @@ -23,14 +23,13 @@ PIDFILE[0]="/var/run/dnscrypt-wrapper/dnscrypt-wrapper-0.pid" USER[0]="dnscrypt" #USER[0]="nobody" -# If DNSCRYPTDIR is set, it will look for files crypt_public.key, -# crypt_secret.key, public.key, and secret.key in the specified directory. -# CRYPTPUBLICKEYFILE, CRYPTSECRETKEYFILE, PROVIDERPUBLICKEYFILE and -# PROVIDERSECRETKEYFILE will be ignored. +# If DNSCRYPTDIR is set, it will look for files crypt_secret.key, public.key, +# and secret.key in the specified directory. +# CRYPTSECRETKEYFILE, PROVIDERPUBLICKEYFILE and PROVIDERSECRETKEYFILE will be +# ignored. DNSCRYPTDIR[0]="/var/lib/dnscrypt-wrapper" # Or, if DNSCRYPTDIR is unset, you can specify those files manually. -#CRYPTPUBLICKEYFILE[0]="/var/lib/dnscrypt-wrapper/crypt_public.key" #CRYPTSECRETKEYFILE[0]="/var/lib/dnscrypt-wrapper/crypt_secret.key" #PROVIDERPUBLICKEYFILE[0]="/var/lib/dnscrypt-wrapper/public.key" #PROVIDERSECRETKEYFILE[0]="/var/lib/dnscrypt-wrapper/secret.key" diff --git a/network/dnscrypt-wrapper/dnscrypt-wrapper.info b/network/dnscrypt-wrapper/dnscrypt-wrapper.info index fadd6383f4..c31fd24114 100644 --- a/network/dnscrypt-wrapper/dnscrypt-wrapper.info +++ b/network/dnscrypt-wrapper/dnscrypt-wrapper.info @@ -1,10 +1,10 @@ PRGNAM="dnscrypt-wrapper" -VERSION="0.1.16" +VERSION="0.1.17" HOMEPAGE="https://github.com/Cofyc/dnscrypt-wrapper" -DOWNLOAD="https://github.com/Cofyc/dnscrypt-wrapper/archive/v0.1.16.tar.gz \ - https://github.com/Cofyc/argparse/archive/2f310edc35e5adacaf738ccb9d73d9c23f4e38b1.tar.gz" -MD5SUM="f393f3962fb5c9e596623ffa8553353a \ - 8165f08226ca5ee68c08d5fa9b706202" +DOWNLOAD="https://github.com/Cofyc/dnscrypt-wrapper/archive/v0.1.17.tar.gz \ + https://github.com/Cofyc/argparse/archive/e1277bf1e3f47663fad54f84ca723db7688630d4.tar.gz" +MD5SUM="68612a6ba9d333899713d9bf45e3e268 \ + 761c42af45d67aa2a58f27d32dd56240" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libsodium" diff --git a/network/dnscrypt-wrapper/rc.dnscrypt-wrapper b/network/dnscrypt-wrapper/rc.dnscrypt-wrapper index edde4ebb06..78e5a27349 100644 --- a/network/dnscrypt-wrapper/rc.dnscrypt-wrapper +++ b/network/dnscrypt-wrapper/rc.dnscrypt-wrapper @@ -50,14 +50,10 @@ start_instance() { OPTIONS="${OPTIONS} --user=${USER[$1]}" fi if [ -n "${DNSCRYPTDIR[$1]}" ]; then - OPTIONS="${OPTIONS} --crypt-publickey-file=${DNSCRYPTDIR[$1]}/crypt_public.key" OPTIONS="${OPTIONS} --crypt-secretkey-file=${DNSCRYPTDIR[$1]}/crypt_secret.key" OPTIONS="${OPTIONS} --provider-publickey-file=${DNSCRYPTDIR[$1]}/public.key" OPTIONS="${OPTIONS} --provider-secretkey-file=${DNSCRYPTDIR[$1]}/secret.key" fi - if [ -z "${DNSCRYPTDIR[$1]}" ] && [ -n "${CRYPTPUBLICKEYFILE[$1]}" ]; then - OPTIONS="${OPTIONS} --crypt-publickey-file=${CRYPTPUBLICKEYFILE[$1]}" - fi if [ -z "${DNSCRYPTDIR[$1]}" ] && [ -n "${CRYPTSECRETKEYFILE[$1]}" ]; then OPTIONS="${OPTIONS} --crypt-secretkey-file=${CRYPTSECRETKEYFILE[$1]}" fi @@ -130,10 +126,10 @@ generate-keys_instance() { ( echo "Generating keys for instance $1. You should record the fingerprint, since this will be used by clients." cd ${DNSCRYPTDIR[$1]} - rm -f crypt_secret.key crypt_public.key public.key secret.key + rm -f crypt_secret.key public.key secret.key $DAEMON --gen-provider-keypair $DAEMON --gen-crypt-keypair - chmod 0600 crypt_secret.key crypt_public.key public.key secret.key + chmod 0600 crypt_secret.key public.key secret.key ) } @@ -148,14 +144,10 @@ generate-cert_instance() { fi OPTIONS="" if [ -n "${DNSCRYPTDIR[$1]}" ]; then - OPTIONS="${OPTIONS} --crypt-publickey-file=${DNSCRYPTDIR[$1]}/crypt_public.key" OPTIONS="${OPTIONS} --crypt-secretkey-file=${DNSCRYPTDIR[$1]}/crypt_secret.key" OPTIONS="${OPTIONS} --provider-publickey-file=${DNSCRYPTDIR[$1]}/public.key" OPTIONS="${OPTIONS} --provider-secretkey-file=${DNSCRYPTDIR[$1]}/secret.key" fi - if [ -z "${DNSCRYPTDIR[$1]}" ] && [ -n "${CRYPTPUBLICKEYFILE[$1]}" ]; then - OPTIONS="${OPTIONS} --crypt-publickey-file=${CRYPTPUBLICKEYFILE[$1]}" - fi if [ -z "${DNSCRYPTDIR[$1]}" ] && [ -n "${CRYPTSECRETKEYFILE[$1]}" ]; then OPTIONS="${OPTIONS} --crypt-secretkey-file=${CRYPTSECRETKEYFILE[$1]}" fi -- cgit v1.2.3