Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (2e4d43fc000863d40eebc0fb68ecf1661e01d03f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (2e4d43fc000863d40eebc0fb68ecf1661e01d03f)
  • Date: Wed, 5 Aug 2020 19:46:20 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

net/tor/DETAILS | 14 ++++++--------
net/tor/HISTORY | 5 +++++
net/tor/PREPARE | 3 ++-
3 files changed, 13 insertions(+), 9 deletions(-)

New commits:
commit 2e4d43fc000863d40eebc0fb68ecf1661e01d03f
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

tor 0.4.4.3-alpha (devel)

commit d1b02c42349d47ca87ba6483913327fa8ed1b623
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

tor 0.4.3.6 (stable)

commit 071c5a924258b30a6a260ab8ad2a2957c090d5b1
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

tor: Switch to prepare_select_branch

diff --git a/net/tor/DETAILS b/net/tor/DETAILS
index aa254ca..34e958c 100755
--- a/net/tor/DETAILS
+++ b/net/tor/DETAILS
@@ -1,13 +1,12 @@
SPELL=tor
-
-if [ "${TOR_DEVEL}" == "y" ]; then
- VERSION=0.3.4.9
+case "$TOR_BRANCH"
+in devel)
+ VERSION=0.4.4.3-alpha
SECURITY_PATCH=6
-else
- VERSION=0.3.5.11
+;; stable)
+ VERSION=0.4.3.6
SECURITY_PATCH=15
-fi
-
+esac
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE2=${SOURCE}.asc
SOURCE_URL[0]=https://www.torproject.org/dist/${SOURCE}
@@ -16,7 +15,6 @@ fi
SOURCE2_URL[1]=${SOURCE_URL[1]}.asc
SOURCE_GPG=tor.gpg:${SOURCE2}:UPSTREAM_KEY
SOURCE2_IGNORE=signature
-
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
LICENSE[0]=BSD
WEB_SITE=http://www.torproject.org/
diff --git a/net/tor/HISTORY b/net/tor/HISTORY
index 919ad00..3eb2b80 100644
--- a/net/tor/HISTORY
+++ b/net/tor/HISTORY
@@ -1,3 +1,8 @@
+2020-08-05 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE: Switched to using prepare_select_branch
+ * DETAILS: updated stable to 0.4.3.6
+ updated devel to 0.4.4.3-alpha
+
2020-07-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 0.3.5.11

diff --git a/net/tor/PREPARE b/net/tor/PREPARE
index 4228f42..b340e96 100755
--- a/net/tor/PREPARE
+++ b/net/tor/PREPARE
@@ -1 +1,2 @@
-config_query TOR_DEVEL "Build development version?" n
+. "$GRIMOIRE"/FUNCTIONS &&
+prepare_select_branch stable devel



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (2e4d43fc000863d40eebc0fb68ecf1661e01d03f), Ismael Luceno, 08/05/2020

Archive powered by MHonArc 2.6.24.

Top of Page