summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/dnscrypt-wrapper/Makefile.patch10
-rw-r--r--network/dnscrypt-wrapper/dnscrypt-wrapper.82
-rw-r--r--network/dnscrypt-wrapper/dnscrypt-wrapper.SlackBuild18
-rw-r--r--network/dnscrypt-wrapper/dnscrypt-wrapper.info8
4 files changed, 6 insertions, 32 deletions
diff --git a/network/dnscrypt-wrapper/Makefile.patch b/network/dnscrypt-wrapper/Makefile.patch
deleted file mode 100644
index f3ad6ca159..0000000000
--- a/network/dnscrypt-wrapper/Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.orig 2015-06-20 10:56:49.000000000 -0400
-+++ Makefile 2015-06-22 11:05:36.003617280 -0400
-@@ -165,7 +165,6 @@
- @$(MAKE) -C argparse libargparse.a
-
- argparse/argparse.h:
-- git submodule update --init argparse
-
- $(LIB_OBJS): $(LIB_H)
-
diff --git a/network/dnscrypt-wrapper/dnscrypt-wrapper.8 b/network/dnscrypt-wrapper/dnscrypt-wrapper.8
index 8f800106b1..3e5bca2c9a 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" "July 2015" "dnscrypt-wrapper 0.1.17" "System Administration Utilities"
+.TH DNSCRYPT-WRAPPER "8" "August 2015" "dnscrypt-wrapper 0.2" "System Administration Utilities"
.SH NAME
dnscrypt-wrapper \- A server-side DNSCrypt proxy that adds DNSCrypt support to any name resolver.
.SH SYNOPSIS
diff --git a/network/dnscrypt-wrapper/dnscrypt-wrapper.SlackBuild b/network/dnscrypt-wrapper/dnscrypt-wrapper.SlackBuild
index a22ea80be0..4c7a9a29de 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.17}
+VERSION=${VERSION:-0.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -57,27 +57,17 @@ else
LIBDIRSUFFIX=""
fi
-# argparse is a git submodule required for building...
-ARGPARSEVERSION=${ARGPARSEVERSION:-e1277bf1e3f47663fad54f84ca723db7688630d4}
-
set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION argparse-$ARGPARSEVERSION
+rm -rf $PRGNAM-$VERSION
if [ -e $CWD/v$VERSION.tar.gz ]; then
tar xvf $CWD/v$VERSION.tar.gz
else
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
fi
-if [ -e $CWD/$ARGPARSEVERSION.tar.gz ]; then
- tar xvf $CWD/$ARGPARSEVERSION.tar.gz
-else
- tar xvf $CWD/argparse-$ARGPARSEVERSION.tar.gz
-fi
-# argparse source is expected in dnscrypt source...
-mv argparse-$ARGPARSEVERSION/* $PRGNAM-$VERSION/argparse/
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -86,10 +76,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-# Patch out git submodule init. Already have argparse anyway, and this is not
-# a git repo (so it would fail)...
-patch -p0 < $CWD/Makefile.patch
-
make configure
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/network/dnscrypt-wrapper/dnscrypt-wrapper.info b/network/dnscrypt-wrapper/dnscrypt-wrapper.info
index c31fd24114..6b6b45d16c 100644
--- a/network/dnscrypt-wrapper/dnscrypt-wrapper.info
+++ b/network/dnscrypt-wrapper/dnscrypt-wrapper.info
@@ -1,10 +1,8 @@
PRGNAM="dnscrypt-wrapper"
-VERSION="0.1.17"
+VERSION="0.2"
HOMEPAGE="https://github.com/Cofyc/dnscrypt-wrapper"
-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="https://github.com/Cofyc/dnscrypt-wrapper/archive/v0.2.tar.gz"
+MD5SUM="82a5cdc237be25309544db64cbd4c87b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="libsodium"