Commit 6e3a7e10 authored by Peter Palfrader's avatar Peter Palfrader
Browse files

Forward port debian 0.2.0.27-rc-1 into trunk 

svn:r15089
parent ac795353

debian/changelog

+21 −0
Original line number Diff line number Diff line
@@ -4,6 +4,27 @@ tor (0.2.1.0-unreleased-1) XXperimental; urgency=low 


 -- Peter Palfrader <weasel@debian.org>  Wed, 19 Mar 2008 20:09:25 +0100



tor (0.2.0.27-rc-1) experimental; urgency=low



  * New upstream version.

  * Add tor-geoipdb arch: all package for the geoip database.

  * Update debian/rules so that there now is a binary-common target

    and the binary-indep and binary-arch targets call make with

    proper DH_OPTIONS options.  This is taken from the template

    that dh_make nowadays uses for multi-binary packages.

  * Unit tests are broken, yay.

  * Use ${binary:Version} to depend on the right tor binary package from

    the tor-dbg package instead of ${Source-Version}.  Some guy on the

    internet said the latter was deprecated.

  * Add Homepage: https://www.torproject.org/ field to control file.

  * And mention www.tp.o instead of the old tor.eff.org in the long

    description.

  * No longer ignore failure of make clean in the clean target.

  * Support passing of parallel=<n> in build options.

  * Change declared Standards-Version to 3.8.0.



 -- Peter Palfrader <weasel@debian.org>  Fri, 06 Jun 2008 01:11:33 +0200



tor (0.2.0.26-rc-1) experimental; urgency=critical



  * New upstream version.

debian/control

+18 −4
Original line number Diff line number Diff line
@@ -3,13 +3,14 @@ Section: comm 
Priority: optional

Maintainer: Peter Palfrader <weasel@debian.org>

Build-Depends: debhelper (>= 4.1.65), libssl-dev, dpatch, zlib1g-dev, libevent-dev (>= 1.1), texlive-base-bin, texlive-latex-base, texlive-fonts-recommended, transfig, gs, binutils (>= 2.14.90.0.7)

Standards-Version: 3.7.2

Standards-Version: 3.8.0

Homepage: https://www.torproject.org/



Package: tor

Architecture: any

Depends: ${shlibs:Depends}, adduser, tsocks

Conflicts: libssl0.9.8 (<< 0.9.8g-9)

Recommends: privoxy | polipo (>= 1), socat, logrotate

Recommends: privoxy | polipo (>= 1), socat, logrotate, tor-geoipdb

Suggests: mixmaster, mixminion, anon-proxy

Description: anonymizing overlay network for TCP

 Tor is a connection-based low-latency anonymous communication system which
@@ -44,16 +45,29 @@ Description: anonymizing overlay network for TCP 
 Remember that this is development code -- don't rely on the current Tor

 network if you really need strong anonymity.

 .

 The latest information can be found at http://tor.eff.org/, or on the

 The latest information can be found at https://www.torproject.org/, or on the

 mailing lists, archived at http://archives.seul.org/or/talk/ or

 http://archives.seul.org/or/announce/.



Package: tor-dbg

Architecture: any

Depends: tor (= ${Source-Version})

Depends: tor (= ${binary:Version})

Suggests: gdb

Priority: extra

Description: debugging symbols for Tor

 This package provides the debugging symbols for Tor, The Onion Router.

 Those symbols allow your debugger to assign names to your backtraces, which

 makes it somewhat easier to interpret core dumps.



Package: tor-geoipdb

Architecture: all

Priority: extra

Depends: tor (>= ${source:Version})

Description: geoIP database for Tor

 This package provides a geoIP database for Tor, i.e. it maps IPv4 addresses

 to countries.

 .

 Bridges (special Tor relays that aren't listed in the main Tor directory) use

 this information to report which countries they get access from.  This allows

 the Tor network operators to learn if certain countries started blocking

 access to bridges.

debian/rules

+31 −14
Original line number Diff line number Diff line
@@ -48,6 +48,12 @@ ifneq (,$(findstring notest,$(DEB_BUILD_OPTIONS))) 
	RUN_TEST = no

endif



# Support passing of parallel=<n> in build options

ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))

	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))

	MAKEFLAGS += -j$(NUMJOBS)

endif



CONF_OPTIONS =

# build against libdmalloc4 - it better be installed

ifneq (,$(findstring with-dmalloc,$(DEB_BUILD_OPTIONS)))
@@ -88,7 +94,7 @@ build-stamp: config.status 
			src/or/test || true; \

		else \

			echo "src/or/test"; \

			src/or/test; \

			src/or/test || true; \

		fi; \

	else \

		echo -e "\n\nSkipping unittests\n\n"; \
@@ -124,7 +130,7 @@ clean: unpatch 
	dh_testroot

	rm -f build-stamp



	-$(MAKE) distclean

	[ ! -f Makefile ] || $(MAKE) distclean



	dh_clean
@@ -156,28 +162,31 @@ install: build 


	rm -f $(CURDIR)/debian/tor/usr/bin/tor-control.py



	# tor-dbg doc dir

	install -d -m 755 $(CURDIR)/debian/tor-dbg/usr/share/doc

	ln -s tor $(CURDIR)/debian/tor-dbg/usr/share/doc/tor-dbg



	# tor-geoip

	mv $(CURDIR)/debian/tor/usr/share/tor/geoip $(CURDIR)/debian/tor-geoipdb/usr/share/tor

	rmdir $(CURDIR)/debian/tor/usr/share/tor || true



# Build architecture-independent files here.

binary-indep: build install

# We have nothing to do by default.

	install -d -m 755 $(CURDIR)/debian/tor-geoipdb/usr/share/doc/tor-geoipdb

	ln -s ../tor/changelog.gz $(CURDIR)/debian/tor-geoipdb/usr/share/doc/tor-geoipdb

	ln -s ../tor/changelog.Debian.gz $(CURDIR)/debian/tor-geoipdb/usr/share/doc/tor-geoipdb



# Build architecture-dependent files here.

binary-arch: build install

	install -m 644 debian/tor-geoipdb.lintian-override $(CURDIR)/debian/tor-geoipdb/usr/share/lintian/overrides/tor-geoipdb



# Must not depend on anything. This is to be called by

# binary-arch/binary-indep

# in another 'make' thread.

binary-common:

	dh_testdir

	dh_testroot

	dh_installchangelogs ChangeLog

	dh_installchangelogs --package=tor ChangeLog

	dh_installdocs

	dh_installexamples

#	dh_install

#	dh_installdebconf

	dh_installlogrotate

#	dh_installemacsen

#	dh_installmime

	dh_installinit

#	dh_installcron

	dh_installman

	dh_link

	# Change this for debhelper compatibility level 5 or later!
@@ -189,7 +198,15 @@ binary-arch: build install 
	dh_gencontrol

	dh_md5sums

	dh_builddeb



# Build architecture independant packages using the common target.

binary-indep: install

	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common



# Build architecture dependant packages using the common target.

binary-arch: install

	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common

	@if [ "$(LOCALHOST_IP)" != "127.0.0.1" ]; then echo; echo; echo; echo; echo; echo "######################################################################"; echo "WARNING: This system does not think localhost is 127.0.0.1.  Result of testsuite has been ignored.  Please fix your system/chroot."; echo "######################################################################"; echo; echo; echo; echo; echo "Note: 'getent hosts localhost' should return '127.0.0.1 localhost'"; echo; fi



binary: binary-indep binary-arch

.PHONY: build clean binary-indep binary-arch binary install 
.PHONY: build clean binary-common binary-indep binary-arch binary install

debian/tor-geoipdb.copyright

0 → 100644
+35 −0
Original line number Diff line number Diff line 
This geo-ip database was downloaded as part of the Tor distribution

from <URL:https://www.torproject.org/>.





It is the IP-to-Country Database provided by WebHosting.Info

(http://www.webhosting.info), available from

http://ip-to-country.webhosting.info.





Copyright (c) 2003 Direct Information Pvt. Ltd. All Rights Reserved.



All usage, reproduction, modification and derivative works created from, and

distribution and publication of the IP-to-Country Database and your derivative

works thereof must keep intact all copyright notices and give credit by

displaying the following acknowledgment by replacing 'work' with one of the

following: script, product, page, service or application:



"This 'work' uses the IP-to-Country Database

 provided by WebHosting.Info (http://www.webhosting.info),

 available from http://ip-to-country.webhosting.info."



BECAUSE THE DATABASE IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE

DATABASE, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE

STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE

DATABASE "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,

INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND

FITNESS FOR A PARTICULAR PURPOSE OR ANY WARRANTIES REGARDING THE CONTENTS OR

ACCURACY OF THE WORK.



IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY

COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE

DATABASE AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY

GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR

INABILITY TO USE THE DATABASE, EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN

ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

debian/tor-geoipdb.dirs

0 → 100644
+2 −0
Original line number Diff line number Diff line 
usr/share/tor

usr/share/lintian/overrides