[SM-Commit] GIT changes to devel-xorg-modular grimoire by Vlad Glagolev (86b777b9e69726d1f4addb97b58274a9438b63ca)

Vlad Glagolev scm at sourcemage.org
Fri Dec 16 17:11:52 EST 2011


GIT changes to devel-xorg-modular grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 net/tor/BUILD     |    1 -
 net/tor/CONFIGURE |    8 --------
 net/tor/DEPENDS   |    3 +++
 net/tor/DETAILS   |    4 ++--
 net/tor/HISTORY   |    7 +++++++
 5 files changed, 12 insertions(+), 11 deletions(-)

New commits:
commit 2d9bc661ebce70afaa95d780821eee2216dba017
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    tor: => 0.2.2.35 (security)

diff --git a/net/tor/BUILD b/net/tor/BUILD
index 3115ab8..ec11f95 100755
--- a/net/tor/BUILD
+++ b/net/tor/BUILD
@@ -4,7 +4,6 @@ fi &&
 
 OPTS="--with-tor-user=$TOR_USERGROUP \
      --with-tor-group=$TOR_USERGROUP \
-                      $TOR_OPTS \
                       $OPTS" &&
 
 default_build
diff --git a/net/tor/CONFIGURE b/net/tor/CONFIGURE
index 658fffc..f2d6fb3 100755
--- a/net/tor/CONFIGURE
+++ b/net/tor/CONFIGURE
@@ -1,9 +1 @@
-config_query_option TOR_OPTS 'Enable code for directories to collect per-country statistics?' n  \
-                             '--enable-geoip-stats' \
-                             '--disable-geoip-stats' &&
-
-config_query_option TOR_OPTS 'Enable iPhone support?' n  \
-                             '--enable-iphone' \
-                             '--disable-iphone' &&
-
 config_query_string TOR_USERGROUP 'Which user/group to use for tor?' 'tor'
diff --git a/net/tor/DEPENDS b/net/tor/DEPENDS
index da251f6..b1b9ae4 100755
--- a/net/tor/DEPENDS
+++ b/net/tor/DEPENDS
@@ -1,5 +1,8 @@
 depends  openssl  &&
 depends  libevent &&
+
+optional_depends geoip "" "" "to collect per-country statistics" &&
+
 suggest_depends  socat   '' '' 'more secure tunnel'  &&
 suggest_depends  tsocks  ""  ""  "to enable use of torify"  &&
 suggest_depends  SYSTEM-LOGGER  '' '' 'to enable logging to syslog'
diff --git a/net/tor/DETAILS b/net/tor/DETAILS
index e07d380..31961e9 100755
--- a/net/tor/DETAILS
+++ b/net/tor/DETAILS
@@ -4,8 +4,8 @@ if [ "$TOR_DEVEL" == "y" ]; then
          VERSION=0.2.2.23-alpha
   SECURITY_PATCH=4
 else
-         VERSION=0.2.2.34
-  SECURITY_PATCH=5
+         VERSION=0.2.2.35
+  SECURITY_PATCH=6
 fi
 
           SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/net/tor/HISTORY b/net/tor/HISTORY
index 938c35c..738df05 100644
--- a/net/tor/HISTORY
+++ b/net/tor/HISTORY
@@ -1,3 +1,10 @@
+2011-12-17 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 0.2.2.35; SECURITY_PATCH++ (CVE-2011-2778)
+	* CONFIGURE: removed deprecated (2010-02) IPhone option; switched to
+	  geoip dependency
+	* DEPENDS: added geoip optional dependency
+	* BUILD: removed useless TOR_OPTS
+
 2011-10-28 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 0.2.2.34; SECURITY_PATCH++ (CVE-2011-2768)
 


More information about the SM-Commit mailing list