Use --require-version to prevent running trunnel pre-1.2

(Also, regenerate trunnel stuff with trunnel 1.2.  This just adds a
few comments to our output.)

diff --git a/scripts/codegen/run_trunnel.sh b/scripts/codegen/run_trunnel.sh
index df84a6e2a7f4ea91d8467b31401b9c73d3d4e97c..5f694ce6c90867cb1bbc552dee96e8d7da4bd7a9 100755 (executable)
--- a/scripts/codegen/run_trunnel.sh
+++ b/scripts/codegen/run_trunnel.sh
@@ -5,7 +5,7 @@ if test "x$TRUNNEL_PATH" != "x"; then
   export PYTHONPATH
 fi
 
-python -m trunnel ./src/trunnel/*.trunnel
+python -m trunnel --require-version=1.2 ./src/trunnel/*.trunnel
 
-python -m trunnel --write-c-files --target-dir=./src/ext/trunnel/
+python -m trunnel --require-version=1.2 --write-c-files --target-dir=./src/ext/trunnel/
 

diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h
index 4dd710f4a77916e16f4c1e1f44d40772c06ea827..c88ee3988eb8f2382bd912d9f71e353981597199 100644 (file)
--- a/src/ext/trunnel/trunnel-impl.h
+++ b/src/ext/trunnel/trunnel-impl.h
@@ -1,3 +1,7 @@
+/* trunnel-impl.h -- copied from Trunnel v1.2
+ * https://gitweb.torproject.org/trunnel.git
+ * You probably shouldn't edit this file.
+ */
 /* trunnel-impl.h -- Implementation helpers for trunnel, included by
  * generated trunnel files
  *

diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c
index 4bc28e3f04e1728dc41f9a583c67505262b1f8ff..da4885ca0159ef628a027f158d1013ff9e1a36cf 100644 (file)
--- a/src/ext/trunnel/trunnel.c
+++ b/src/ext/trunnel/trunnel.c
@@ -1,3 +1,7 @@
+/* trunnel.c -- copied from Trunnel v1.2
+ * https://gitweb.torproject.org/trunnel.git
+ * You probably shouldn't edit this file.
+ */
 /* trunnel.c -- Helper functions to implement trunnel.
  *
  * Copyright 2014, The Tor Project, Inc.

diff --git a/src/ext/trunnel/trunnel.h b/src/ext/trunnel/trunnel.h
index 0a78e6cfcab854473f35c41ce7f2bbabec74945c..f51cade03f9203231f4983df028a03a0a1753691 100644 (file)
--- a/src/ext/trunnel/trunnel.h
+++ b/src/ext/trunnel/trunnel.h
@@ -1,3 +1,7 @@
+/* trunnel.h -- copied from Trunnel v1.2
+ * https://gitweb.torproject.org/trunnel.git
+ * You probably shouldn't edit this file.
+ */
 /* trunnel.h -- Public declarations for trunnel, to be included
  * in trunnel header files.
 

diff --git a/src/trunnel/pwbox.c b/src/trunnel/pwbox.c
index 0fbbf2eb6a57b2aa0ceff20a5e9df1b33555750f..b70e1d8265a37d479950b423a3c5b560260c5d30 100644 (file)
--- a/src/trunnel/pwbox.c
+++ b/src/trunnel/pwbox.c
@@ -1,5 +1,6 @@
-/* pwbox.c -- generated by Trunnel v1.1-dev.
+/* pwbox.c -- generated by Trunnel v1.2.
  * https://gitweb.torproject.org/trunnel.git
+ * You probably shouldn't edit this file.
  */
 #include <stdlib.h>
 #include "trunnel-impl.h"

diff --git a/src/trunnel/pwbox.h b/src/trunnel/pwbox.h
index 84bbdf3a80326ad5c6bd98326d8c6e6bccf68a1b..5b170eb45e641bd949f36ca21d7a0fd32cf829bd 100644 (file)
--- a/src/trunnel/pwbox.h
+++ b/src/trunnel/pwbox.h
@@ -1,5 +1,6 @@
-/* pwbox.h -- generated by by Trunnel v1.1-dev.
+/* pwbox.h -- generated by by Trunnel v1.2.
  * https://gitweb.torproject.org/trunnel.git
+ * You probably shouldn't edit this file.
  */
 #ifndef TRUNNEL_PWBOX_H
 #define TRUNNEL_PWBOX_H