nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix problems introduced by rpm spec patch.

Browse Source 
svn:r2675
This commit is contained in:
Nick Mathewson 2004-11-04 15:34:04 +00:00
parent 69e5e8d0ad
commit 831c988ea1
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/config/torrc.sample.in
View File

@ -45,16 +45,18 @@ DirServer 18.244.0.188:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441
DirServer 18.244.0.114:80 719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF
DirServer 62.116.124.106:9030 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D
# The directory for keeping all the keys/etc for this server. By
# default, we store things in $HOME/.tor on Unix, and in Application
# Data\tor on Windows.
#DataDirectory @LOCALSTATEDIR@/lib/tor
##################### Below is just for servers #####################
## NOTE: If you enable these, you should consider mailing your
## identity key fingerprint to the tor-ops, so we can verify
## your configuration. See the README for details.
## The directory for keeping all the keys/etc for this server
DataDirectory @LOCALSTATEDIR@/lib/tor
#Nickname ididntedithtconfig # A unique handle for this server
#Nickname ididnteditheconfig # A unique handle for this server
#Address noname.example.com # The IP or fqdn for this server
#ContactInfo 1234D/FFFFFFFF Random Person <nobody@example.com>

8
tor.spec.in
View File

@ -6,7 +6,7 @@
# This should be incremented whenever the spec file changes, but
# can drop back to zero at a new Tor version
%define specver 0
%define specver 1
## Things users may want to change
#
@ -27,7 +27,7 @@
# versions... while making as few confusing changes to the standard
# release naming as possible.
# XXXX009 Execept that handling cvs breaks this.
%define version %(echo %{native_version} | sed 's/-cvs/.cvs/' -e 's/pre/.pre./' -e 's/rc/.rc./' -e 's/([0-9])$/\1.release/')
%define version %(echo %{native_version} | sed -e 's/-cvs/.cvs/' -e 's/pre/.pre./' -e 's/rc/.rc./' -e 's/([0-9])$/\1.release/')
## Release and OS identification song and dance
#
@ -46,11 +46,11 @@
%if %{is_fc}
%define ostag %(sed -e 's/^.*release /fc/' -e 's/ .*$//' -e 's/\\./_/g' < /etc/fedora-release)
%endif
%else
%if %{is_rh}
%define ostag %(sed -e 's/^.*release /rh/' -e 's/ .*$//' -e 's/\\./_/g' < /etc/redhat-release)
%endif
%endif
# These are probably wrong... just placeholders should we actually
# end up supporting these distributions