From: Vishal Biswas <vshlbiswas@ymail.com>
Date: Sun, 11 Jun 2017 23:47:45 +0000 (+0530)
Subject: tor update and enable squid cache server (#1077)
X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/commitdiff_plain/bfe763fa5bc0f90932755b9e833fe57c6c575c15

tor update and enable squid cache server (#1077)

* tor: update from 0.3.0.7 to 0.3.0.8

* squid: update from 3.5.25 to 3.5.26 & enable package
---

diff --git a/disabled-packages/squid/build.sh b/disabled-packages/squid/build.sh
deleted file mode 100644
index e7e52091..00000000
--- a/disabled-packages/squid/build.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-TERMUX_PKG_HOMEPAGE=http://www.squid-cache.org
-TERMUX_PKG_DESCRIPTION="Full-featured Web proxy cache server"
-TERMUX_PKG_VERSION=3.5.25
-TERMUX_PKG_DEPENDS="libcrypt, openssl"
-TERMUX_PKG_SRCURL=http://www.squid-cache.org/Versions/v3/3.5/squid-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=28959254c32b8cd87e9599b6beb97352cf0638524e0f5ac3e1754f08462f3585
-TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
-# disk-io requires msgctl and store-io requires disk-io
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --disable-strict-error-checking --disable-disk-io --disable-storeio --without-mit-krb5 --with-dl"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-openssl --enable-auth --without-libnettle --enable-translation --with-size-optimizations --without-libxml2"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --libexecdir=$TERMUX_PREFIX/libexec/squid --sysconfdir=$TERMUX_PREFIX/etc/squid --datarootdir=$TERMUX_PREFIX/share/squid"
-
-termux_step_pre_configure () {
-	TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" squid_cv_gnu_atomics=yes"
-	LDFLAGS="$LDFLAGS -llog"
-
-	# needed for building cf_gen
-	export BUILDCXX=g++
-	# else it picks up our cross CXXFLAGS
-	export BUILDCXXFLAGS=' '
-}
-
diff --git a/disabled-packages/squid/CpuAffinitySet.cc.patch b/packages/squid/CpuAffinitySet.cc.patch
similarity index 100%
rename from disabled-packages/squid/CpuAffinitySet.cc.patch
rename to packages/squid/CpuAffinitySet.cc.patch
diff --git a/packages/squid/build.sh b/packages/squid/build.sh
new file mode 100644
index 00000000..181c7d1f
--- /dev/null
+++ b/packages/squid/build.sh
@@ -0,0 +1,35 @@
+TERMUX_PKG_HOMEPAGE=http://www.squid-cache.org
+TERMUX_PKG_DESCRIPTION="Full-featured Web proxy cache server"
+TERMUX_PKG_VERSION=3.5.26
+TERMUX_PKG_DEPENDS="libcrypt, openssl"
+TERMUX_PKG_SRCURL=http://www.squid-cache.org/Versions/v3/3.5/squid-${TERMUX_PKG_VERSION}.tar.xz
+TERMUX_PKG_SHA256=baa1eecb7d6e18881f4455060d80ee7cb95ae7e2695fdccf7e21ccc8f879a982
+TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"
+# disk-io requires msgctl and store-io requires disk-io
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+--disable-strict-error-checking
+--disable-disk-io
+--disable-storeio
+--without-mit-krb5
+--with-dl
+--with-openssl
+--enable-auth
+--without-libnettle
+--enable-translation
+--with-size-optimizations
+--without-libxml2
+--libexecdir=$TERMUX_PREFIX/libexec/squid
+--sysconfdir=$TERMUX_PREFIX/etc/squid
+--datarootdir=$TERMUX_PREFIX/share/squid
+squid_cv_gnu_atomics=yes
+"
+
+termux_step_pre_configure () {
+	LDFLAGS="$LDFLAGS -llog"
+
+	# needed for building cf_gen
+	export BUILDCXX=g++
+	# else it picks up our cross CXXFLAGS
+	export BUILDCXXFLAGS=' '
+}
+
diff --git a/packages/tor/build.sh b/packages/tor/build.sh
index 287c0a64..4918cab5 100644
--- a/packages/tor/build.sh
+++ b/packages/tor/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://www.torproject.org
 TERMUX_PKG_DESCRIPTION="The Onion Router anonymizing overlay network"
 TERMUX_PKG_DEPENDS="libevent, openssl"
-TERMUX_PKG_VERSION=0.3.0.7
+TERMUX_PKG_VERSION=0.3.0.8
 TERMUX_PKG_SRCURL=https://www.torproject.org/dist/tor-$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=9640c4448ef3cad7237c68ed6984e705db8fb2b9d6bb74c8815d01bb06527d02
+TERMUX_PKG_SHA256=663a3ba7b8a124c0f8a7351eaa2dda6fd518de3f3c4ee28fff869bfb03860d48
 TERMUX_PKG_CONFFILES="etc/tor/torrc"
 TERMUX_PKG_MAINTAINER="Vishal Biswas @vishalbiswas"