Commit Graph

56 Commits

Author SHA1 Message Date
Peter Palfrader
50feca0dcb Drop debian/patches/0a58567c-work-with-reneg-ssl.dpatch (part of upstream) 2009-11-23 18:59:05 +01:00
Peter Palfrader
a28b5628c2 Pick 0a58567ce3 from master git tree
work with libssl that has renegotiation disabled by default.
(debian/patches/0a58567c-work-with-reneg-ssl.dpatch)
2009-11-15 10:41:33 +01:00
Peter Palfrader
2bf59689a2 Forward port patches/06_add_compile_time_defaults.dpatch 2009-09-03 15:10:47 +02:00
Peter Palfrader
7dba7dcf71 Forward port patches/03_tor_manpage_in_section_8.dpatch 2009-09-03 15:07:08 +02:00
Peter Palfrader
6be66447e7 Forward port 06_add_compile_time_defaults 2009-06-20 13:00:41 +02:00
Peter Palfrader
6a11cded87 patches/06_add_compile_time_defaults: Only set the User option in the config if
we run as root.  Do not set it when run as debian-tor as Tor then always
insists on changing users which will fail.  (If we run as any other user we
don't set our debian defaults anyway.)


svn:r18397
2009-02-04 23:42:39 +00:00
Peter Palfrader
df5a94fc67 And forward port patches
svn:r18195
2009-01-21 00:01:07 +00:00
Peter Palfrader
24ff823b0e Forward port 03_tor_manpage_in_section_8.dpatch
svn:r18074
2009-01-11 11:12:04 +00:00
Peter Palfrader
90e832a5db No longer set now obsolete Group setting in built-in debian config
svn:r17237
2008-11-10 15:52:53 +00:00
Peter Palfrader
ce5d2bc5fb Forward port 14_fix_geoip_warning.dpatch
svn:r17016
2008-09-30 13:11:36 +00:00
Peter Palfrader
b2fcc417d4 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
svn:r15131
2008-06-11 11:12:40 +00:00
Peter Palfrader
2cb7f63c9c Forward port patch 06_add_compile_time_defaults.
svn:r13972
2008-03-11 14:38:24 +00:00
Peter Palfrader
c6a7ab729c Update debian defaults in preparation for starting as root.
Previously the debian defaults were only loaded when we started Tor as
the debian-tor user.  Now they are also loaded when started as root.
In addition to logging, pidfile, datadir and runasdaemon we also change
the User and Group options from their NULL default to "debian-tor" so that
Tor correctly setuids/setgids to the role user the package created.

This will allow us to start the daemon as root.


svn:r13685
2008-02-23 12:59:52 +00:00
Peter Palfrader
4327263f83 Forward port patches/03_tor_manpage_in_section_8.dpatch
svn:r13454
2008-02-10 00:13:22 +00:00
Peter Palfrader
03f64638cb Remove 13_r12907-fix-unit-tests.dpatch (Fix unit tests from HEAD) again - it's
included upstream.


svn:r12941
2007-12-23 09:46:38 +00:00
Peter Palfrader
57c26115fc * New upstream version.
* Fix unit tests from HEAD (13_r12907-fix-unit-tests.dpatch).


svn:r12909
2007-12-21 12:23:23 +00:00
Peter Palfrader
5973a2a564 Remove 12_r12235_do_not_crash_when_myfamily_is_set.dpatch
svn:r12502
2007-11-15 10:06:59 +00:00
Peter Palfrader
0b9cdfd2f5 Build a 0.2.0.9-alpha-2 with r12235: do not crash with a myfamily setting
svn:r12236
2007-10-27 22:36:17 +00:00
Peter Palfrader
c9b947d89b Forward port 06_add_compile_time_defaults
svn:r10064
2007-04-30 15:05:51 +00:00
Peter Palfrader
8dd603616e Merge branches/tor-0_1_2-patches/debian (from 9860 on) to trunk. This includes 0.1.2.13-1 and 0.1.2.13-2.
svn:r10039
2007-04-27 13:28:07 +00:00
Peter Palfrader
5e31de031e Disable 02_add_debian_files_in_manpage.dpatch for now
svn:r9058
2006-12-09 15:47:34 +00:00
Peter Palfrader
59561b1bed Tell users about the init script when they try to run Tor as root.
Should we also do this when they try to run their Tor as any other
(non root, non debian-tor) user? - add 11_tor_as_root_more_helpful


svn:r6822
2006-07-24 03:38:26 +00:00
Peter Palfrader
f968d38f3e Previously our defaults for DataDirectory, PidFile, RunAsDaemon, and
Log differed from upstreams.  Now Tor behaves just like before (with
our own DataDirectory and all) only when run as the debian-tor user.
If invoked as any other user, Tor will behave just like the pristine
upstream version.


svn:r6821
2006-07-24 03:24:25 +00:00
Peter Palfrader
fb6d4855ba Fix 07_log_to_file_by_default in debian head
svn:r6674
2006-06-21 22:13:03 +00:00
Peter Palfrader
068876eb36 Forward port 07_log_to_file_by_default.dpatch
svn:r6630
2006-06-15 23:20:50 +00:00
Peter Palfrader
4f0d7b7424 Forward port patches/07_log_to_file_by_default
svn:r6263
2006-03-28 07:48:30 +00:00
Peter Palfrader
4eb9dc7bc3 Forward port patches/02_add_debian_files_in_manpage and patches/03_tor_manpage_in_section_8.
svn:r5822
2006-01-12 02:19:40 +00:00
Peter Palfrader
20bcce490a Forward port patches/02_add_debian_files_in_manpage.
svn:r5819
2006-01-12 02:05:11 +00:00
Peter Palfrader
72277b1507 Forward port debian/patches/07_log_to_file_by_default.dpatch again
svn:r5784
2006-01-10 23:18:48 +00:00
Peter Palfrader
60f6247356 And make the debian package build with CVS again
svn:r5572
2005-12-11 15:44:59 +00:00
Peter Palfrader
c0fd66a746 06_add_compile_time_defaults.dpatch
svn:r5256
2005-10-17 02:01:43 +00:00
Peter Palfrader
b3afa98ddb Remove 08_add_newlines_between_serverdescriptors.dpatch
svn:r5241
2005-10-12 18:40:05 +00:00
Peter Palfrader
e459f6ee0f Add directory format fix to debian's 0.1.1.8-alpha-1
svn:r5232
2005-10-08 21:20:01 +00:00
Peter Palfrader
db27c32283 New experimental upstream
svn:r5059
2005-09-14 16:38:46 +00:00
Peter Palfrader
1ea5d312e5 Forward port 06_add_compile_time_defaults.dpatch
svn:r4970
2005-09-09 21:22:52 +00:00
Peter Palfrader
23008f292a Forward port 03_tor_manpage_in_section_8.dpatch
svn:r4969
2005-09-09 21:17:14 +00:00
Peter Palfrader
ad1ff57705 Forward port debian/ patches.
svn:r4767
2005-08-12 15:04:22 +00:00
Peter Palfrader
c8ad2fc003 Fix debian/patches/03_tor_manpage_in_section_8.dpatch:
Change March to May for tor.1.in


svn:r4185
2005-05-08 20:48:24 +00:00
Peter Palfrader
1facdfa8d0 Forward port 03_tor_manpage_in_section_8
svn:r3820
2005-03-22 21:53:35 +00:00
Peter Palfrader
6bdd3da630 Forward port 06_add_compile_time_defaults
svn:r3423
2005-01-23 15:24:33 +00:00
Peter Palfrader
eab35efa67 Forward port patches
svn:r3329
2005-01-09 02:30:28 +00:00
Peter Palfrader
90e91a4a42 And 0.0.9rc7
svn:r3127
2004-12-08 14:23:04 +00:00
Peter Palfrader
cc0fbc0b13 New upstream release (candidate)
svn:r2981
2004-11-24 08:42:37 +00:00
Peter Palfrader
0065066dbe Use nick's patch against config. in the rc1 debian package
svn:r2961
2004-11-23 11:09:38 +00:00
Peter Palfrader
ead200164a Do not patch the default torrc to include settings we really want. Instead modify the compiled in default options.
svn:r2813
2004-11-12 17:17:58 +00:00
Peter Palfrader
abd90020a4 Point to /var/log/tor (the directory) instead of a single file (/var/log/tor/log) in the debian patch of the manpage.
svn:r2811
2004-11-12 16:52:10 +00:00
Peter Palfrader
40f463ec9f Log at level notice of higher, not warn or higher. Thanks arma
svn:r2781
2004-11-10 03:46:06 +00:00
Peter Palfrader
e5fd4c026c No longer use --pidfile, --logfile, and --runasdaemon command line options. Set them in the configfile instead.
svn:r2779
2004-11-10 03:42:06 +00:00
Peter Palfrader
9921ce7c58 Make sure all patches apply cleanly
svn:r2776
2004-11-10 03:30:51 +00:00
Peter Palfrader
967235684e 04_fix_test can be backed out again, it was a backport from cvs to the package
svn:r2775
2004-11-10 03:27:52 +00:00