Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Arjan Bouter (618362692605785d0dd4b1d2732c002dd39eacde)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Arjan Bouter <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Arjan Bouter (618362692605785d0dd4b1d2732c002dd39eacde)
  • Date: Tue, 15 Sep 2009 16:38:05 -0500

GIT changes to master grimoire by Arjan Bouter <abouter AT sourcemage.org>:

ChangeLog | 2 ++
accounts | 1 +
dev/null |binary
groups | 1 +
net/tor.gpg |binary
net/tor/28988BF5.gpg | 0
net/tor/BUILD | 2 ++
net/tor/CONFIGURE | 10 ++++++++++
net/tor/DEPENDS | 3 ++-
net/tor/DETAILS | 2 +-
net/tor/HISTORY | 4 ++++
net/tor/PRE_BUILD | 3 +++
net/vidalia/BUILD | 1 +
net/vidalia/DEPENDS | 3 +++
net/vidalia/DETAILS | 17 +++++++++++++++++
net/vidalia/HISTORY | 3 +++
16 files changed, 50 insertions(+), 2 deletions(-)

New commits:
commit 618362692605785d0dd4b1d2732c002dd39eacde
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

tor: switched to shared tor.gpg (not only the project lead's key)
instead of using one key per spell

commit dd7cff86fe705a1ffdb626c515ce3d186606e165
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

vidalia: switched to shared tor.gpg

commit 74cffd3d9ba9263fc07f5d04e9963c3e4b85de32
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

vidalia: qt tor gui

commit 28ae6d6a8bb40b6437ee6ecc12370d9ae85dd9f0
Author: Arjan Bouter <abouter AT sourcemage.org>
Commit: Arjan Bouter <abouter AT sourcemage.org>

tor: added configurable user/group, iphone and geo-ip

diff --git a/ChangeLog b/ChangeLog
index 4dc7959..aea527e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2009-09-15 Arjan Bouter <abouter AT sourcemage.org>
* gnome2-apps/gpointing-device-settings: new spell, touchpad
configuration GUI
+ * net/vidalia: new spell, qt tor gui
+ * net/tor.gpg: added torproject keyring instead of separate keys in
spells.

2009-09-13 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* utils/pybackpack: new spell, a GUI backup utility
diff --git a/accounts b/accounts
index af5dc85..c159501 100755
--- a/accounts
+++ b/accounts
@@ -15,6 +15,7 @@ dnslog:89:88
dnscache:90:88
axfrdns:91:88
mediatomb:95:95
+tor:96:96
bind:101:101
gnats:102:102
postgres:103:103
diff --git a/groups b/groups
index 0e53ffd..96ac10d 100755
--- a/groups
+++ b/groups
@@ -25,6 +25,7 @@ crontab:66:
firebird:84:
djbdns:88:
mediatomb:95:
+tor:96:
bind:101:
gnats:102:
postgres:103:
diff --git a/net/tor.gpg b/net/tor.gpg
new file mode 100644
index 0000000..afe9952
Binary files /dev/null and b/net/tor.gpg differ
diff --git a/net/tor/28988BF5.gpg b/net/tor/28988BF5.gpg
deleted file mode 100644
index d7c2a54..0000000
Binary files a/net/tor/28988BF5.gpg and /dev/null differ
diff --git a/net/tor/BUILD b/net/tor/BUILD
new file mode 100755
index 0000000..4bccc91
--- /dev/null
+++ b/net/tor/BUILD
@@ -0,0 +1,2 @@
+OPTS="$OPTS $TOR_OPTS" &&
+default_build
diff --git a/net/tor/CONFIGURE b/net/tor/CONFIGURE
new file mode 100755
index 0000000..270fe96
--- /dev/null
+++ b/net/tor/CONFIGURE
@@ -0,0 +1,10 @@
+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' &&
+
+TOR_OPTS="$TOR_OPTS --with-tor-user=$TOR_USERGROUP
--with-tor-group=$TOR_USERGROUP"
diff --git a/net/tor/DEPENDS b/net/tor/DEPENDS
index dca2b2c..da251f6 100755
--- a/net/tor/DEPENDS
+++ b/net/tor/DEPENDS
@@ -1,4 +1,5 @@
depends openssl &&
depends libevent &&
suggest_depends socat '' '' 'more secure tunnel' &&
-suggest_depends tsocks "" "" "to enable use of torify"
+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 40d5c53..0fd8d5c 100755
--- a/net/tor/DETAILS
+++ b/net/tor/DETAILS
@@ -11,7 +11,7 @@ fi
SOURCE_URL[0]=http://www.torproject.org/dist/$SOURCE
SOURCE2=$SOURCE.asc
SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
- SOURCE_GPG=28988BF5.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE_GPG=tor.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE2_IGNORE=signature

SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/net/tor/HISTORY b/net/tor/HISTORY
index b3f36e6..005d9b4 100644
--- a/net/tor/HISTORY
+++ b/net/tor/HISTORY
@@ -1,3 +1,7 @@
+2009-09-15 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD, CONFIGURE, PRE_BUILD: made tor user/group, iphone support
and geo-ip
+ stats optional.
+
2009-09-03 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: stable 0.2.1.19 and devel 0.2.2.1-alpha

diff --git a/net/tor/PRE_BUILD b/net/tor/PRE_BUILD
new file mode 100755
index 0000000..5085296
--- /dev/null
+++ b/net/tor/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+create_account tor
diff --git a/net/vidalia/BUILD b/net/vidalia/BUILD
new file mode 100755
index 0000000..e013b8d
--- /dev/null
+++ b/net/vidalia/BUILD
@@ -0,0 +1 @@
+cmake_build
diff --git a/net/vidalia/DEPENDS b/net/vidalia/DEPENDS
new file mode 100755
index 0000000..a5331ec
--- /dev/null
+++ b/net/vidalia/DEPENDS
@@ -0,0 +1,3 @@
+depends QT &&
+depends tor &&
+depends cmake
diff --git a/net/vidalia/DETAILS b/net/vidalia/DETAILS
new file mode 100755
index 0000000..9ee9ea6
--- /dev/null
+++ b/net/vidalia/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=vidalia
+ VERSION=0.1.15
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=http://www.torproject.org/${SPELL}/dist/${SOURCE}
+ SOURCE2=$SOURCE.asc
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+ SOURCE_GPG=tor.gpg:$SOURCE2:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE="http://www.torproject.org/vidalia/index.html.en";
+ LICENSE[0]=GPL
+ ENTERED=20090915
+ SHORT="QT tor GUI"
+cat << EOF
+Vidalia is a cross-platform controller GUI for the Tor software,
+built using the Qt framework.
+EOF
diff --git a/net/vidalia/HISTORY b/net/vidalia/HISTORY
new file mode 100644
index 0000000..59ac1ba
--- /dev/null
+++ b/net/vidalia/HISTORY
@@ -0,0 +1,3 @@
+2009-09-15 Arjan Bouter <abouter AT sourcemage.org>
+ * BUILD, DEPENDS, DETAILS: spell created
+



  • [SM-Commit] GIT changes to master grimoire by Arjan Bouter (618362692605785d0dd4b1d2732c002dd39eacde), Arjan Bouter, 09/15/2009

Archive powered by MHonArc 2.6.24.

Top of Page