[or-cvs] r15131: Merge 0.1.2.x branch changes since 0.1.2.27-rc-1 into trunk. (in tor/trunk/debian: . patches)
weasel at seul.org
weasel at seul.org
Wed Jun 11 11:12:40 UTC 2008
Author: weasel
Date: 2008-06-11 07:12:40 -0400 (Wed, 11 Jun 2008)
New Revision: 15131
Added:
tor/trunk/debian/patches/14_fix_geoip_warning.dpatch
Removed:
tor/trunk/debian/patches/11_tor_as_root_more_helpful.dpatch
Modified:
tor/trunk/debian/changelog
tor/trunk/debian/patches/00list
tor/trunk/debian/patches/02_add_debian_files_in_manpage.dpatch
tor/trunk/debian/patches/03_tor_manpage_in_section_8.dpatch
tor/trunk/debian/patches/06_add_compile_time_defaults.dpatch
tor/trunk/debian/patches/07_log_to_file_by_default.dpatch
Log:
Merge 0.1.2.x branch changes since 0.1.2.27-rc-1 into trunk. I wonder when we will stop developing in two branches at the same time
Modified: tor/trunk/debian/changelog
===================================================================
--- tor/trunk/debian/changelog 2008-06-11 11:12:29 UTC (rev 15130)
+++ tor/trunk/debian/changelog 2008-06-11 11:12:40 UTC (rev 15131)
@@ -4,6 +4,16 @@
-- Peter Palfrader <weasel at debian.org> Wed, 19 Mar 2008 20:09:25 +0100
+tor (0.2.0.27-rc-X) Xxperimental; urgency=low
+
+ * Remove debian/patches/11_tor_as_root_more_helpful.dpatch as
+ it is no longer needed: We now setuid() to the Tor user
+ when run as root and it all just works.
+ * Add comments to the dpatch headers so lintian shuts up.
+ * Add patches/14_fix_geoip_warning: Change geoipdb open failed message.
+
+ -- Peter Palfrader <weasel at debian.org> Wed, 11 Jun 2008 12:55:49 +0200
+
tor (0.2.0.27-rc-1) experimental; urgency=low
* New upstream version.
Modified: tor/trunk/debian/patches/00list
===================================================================
--- tor/trunk/debian/patches/00list 2008-06-11 11:12:29 UTC (rev 15130)
+++ tor/trunk/debian/patches/00list 2008-06-11 11:12:40 UTC (rev 15131)
@@ -2,4 +2,4 @@
03_tor_manpage_in_section_8.dpatch
06_add_compile_time_defaults.dpatch
07_log_to_file_by_default.dpatch
-11_tor_as_root_more_helpful.dpatch
+14_fix_geoip_warning
Modified: tor/trunk/debian/patches/02_add_debian_files_in_manpage.dpatch
===================================================================
--- tor/trunk/debian/patches/02_add_debian_files_in_manpage.dpatch 2008-06-11 11:12:29 UTC (rev 15130)
+++ tor/trunk/debian/patches/02_add_debian_files_in_manpage.dpatch 2008-06-11 11:12:40 UTC (rev 15131)
@@ -2,7 +2,7 @@
## 02_add_debian_files_in_manpage.dpatch by <weasel at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Change the FILES section of the manpage to properly describe the situation on Debian systems.
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
Modified: tor/trunk/debian/patches/03_tor_manpage_in_section_8.dpatch
===================================================================
--- tor/trunk/debian/patches/03_tor_manpage_in_section_8.dpatch 2008-06-11 11:12:29 UTC (rev 15130)
+++ tor/trunk/debian/patches/03_tor_manpage_in_section_8.dpatch 2008-06-11 11:12:40 UTC (rev 15131)
@@ -2,7 +2,7 @@
## 03_tor_manpage_in_section_8.dpatch by <weasel at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Move the Tor manpage from section 1 to section 8.
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
Modified: tor/trunk/debian/patches/06_add_compile_time_defaults.dpatch
===================================================================
--- tor/trunk/debian/patches/06_add_compile_time_defaults.dpatch 2008-06-11 11:12:29 UTC (rev 15130)
+++ tor/trunk/debian/patches/06_add_compile_time_defaults.dpatch 2008-06-11 11:12:40 UTC (rev 15131)
@@ -2,7 +2,7 @@
## 06_add_compile_time_defaults.dpatch by <weasel at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Change a few compile time defaults so that Tor is better integrated on a Debian system
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
Modified: tor/trunk/debian/patches/07_log_to_file_by_default.dpatch
===================================================================
--- tor/trunk/debian/patches/07_log_to_file_by_default.dpatch 2008-06-11 11:12:29 UTC (rev 15130)
+++ tor/trunk/debian/patches/07_log_to_file_by_default.dpatch 2008-06-11 11:12:40 UTC (rev 15131)
@@ -2,7 +2,7 @@
## 07_log_to_file_by_default.dpatch by <weasel at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Change default logging target from stdout to a logfile
if [ $# -lt 1 ]; then
echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
Deleted: tor/trunk/debian/patches/11_tor_as_root_more_helpful.dpatch
===================================================================
--- tor/trunk/debian/patches/11_tor_as_root_more_helpful.dpatch 2008-06-11 11:12:29 UTC (rev 15130)
+++ tor/trunk/debian/patches/11_tor_as_root_more_helpful.dpatch 2008-06-11 11:12:40 UTC (rev 15131)
@@ -1,36 +0,0 @@
-#! /bin/sh -e
-## 08_no_run_as_root.dpatch by <weasel at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
---- tor~/src/or/main.c 2006-07-23 19:31:29.000000000 +0200
-+++ tor/src/or/main.c 2006-07-24 05:34:30.696138870 +0200
-@@ -1483,7 +1483,7 @@
- #ifndef MS_WINDOWS
- if (geteuid()==0)
- log_warn(LD_GENERAL,"You are running Tor as root. You don't need to, "
-- "and you probably shouldn't.");
-+ "and you probably shouldn't. Maybe you are looking for the init script? '/etc/init.d/tor start'");
- #endif
-
- crypto_global_init(get_options()->HardwareAccel);
Copied: tor/trunk/debian/patches/14_fix_geoip_warning.dpatch (from rev 15129, tor/branches/tor-0_2_0-patches/debian/patches/14_fix_geoip_warning.dpatch)
===================================================================
--- tor/trunk/debian/patches/14_fix_geoip_warning.dpatch (rev 0)
+++ tor/trunk/debian/patches/14_fix_geoip_warning.dpatch 2008-06-11 11:12:40 UTC (rev 15131)
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+## 14_fix_geoip_warning.dpatch by <weasel at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Change geoipdb open failed message
+
+if [ $# -lt 1 ]; then
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+
+case "$1" in
+ -patch) patch -p1 ${patch_opts} < $0;;
+ -unpatch) patch -R -p1 ${patch_opts} < $0;;
+ *)
+ echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
+ exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+diff -urNad git-stable~/src/or/geoip.c git-stable/src/or/geoip.c
+--- git-stable~/src/or/geoip.c 2008-06-06 01:00:41.000000000 +0200
++++ git-stable/src/or/geoip.c 2008-06-11 12:54:17.605150644 +0200
+@@ -147,7 +147,7 @@
+ int severity = should_record_bridge_info(options) ? LOG_WARN : LOG_INFO;
+ clear_geoip_db();
+ if (!(f = fopen(filename, "r"))) {
+- log_fn(severity, LD_GENERAL, "Failed to open GEOIP file %s.", filename);
++ log_fn(severity, LD_GENERAL, "Failed to open GEOIP file %s. Do you have the tor-geoipdb package installed?", filename);
+ return -1;
+ }
+ geoip_countries = smartlist_create();
More information about the tor-commits
mailing list