[or-cvs] Merge 0.1.0.14+XXXX changes
Peter Palfrader
weasel at seul.org
Wed Sep 14 13:06:00 UTC 2005
Update of /home/or/cvsroot/tor/debian
In directory moria:/tmp/cvs-serv7502
Modified Files:
TODO changelog control rules tor.init
Log Message:
Merge 0.1.0.14+XXXX changes
Index: TODO
===================================================================
RCS file: /home/or/cvsroot/tor/debian/TODO,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- TODO 6 Aug 2004 22:36:07 -0000 1.8
+++ TODO 14 Sep 2005 13:05:58 -0000 1.9
@@ -6,5 +6,5 @@
D Deferred
X Abandoned
-- strip debugging symbols when tor is more mature
+o strip debugging symbols when tor is more mature
- don't enable coredumps by default
Index: changelog
===================================================================
RCS file: /home/or/cvsroot/tor/debian/changelog,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- changelog 10 Sep 2005 08:18:30 -0000 1.129
+++ changelog 14 Sep 2005 13:05:58 -0000 1.130
@@ -1,3 +1,9 @@
+tor (0.1.1.6-alpha-2) experimental; urgency=low
+
+ * Merge 0.1.0.14+XXXX changes.
+
+ -- Peter Palfrader <weasel at debian.org> Wed, 14 Sep 2005 15:05:16 +0200
+
tor (0.1.1.6-alpha-1) experimental; urgency=low
* Experimental upstream version.
@@ -22,6 +28,21 @@
-- Peter Palfrader <weasel at debian.org> Fri, 12 Aug 2005 17:02:23 +0200
+tor (0.1.0.14+XXXX) UNRELEASED; urgency=low
+
+ * Ship debugging information in a separate package now, instead
+ of simply not stripping tor. This is still useful while tor is
+ young. Ideally it would go away some time.
+ * Add LSB comments to init script as suggested by Petter Reinholdtsen
+ on the debian-devel list:
+ - http://lists.debian.org/debian-devel/2005/08/msg01172.html
+ - http://wiki.debian.net/?LSBInitScripts
+ * Work around broken chroots that do not resolve localhost or resolve
+ it to the wrong IP. We now catch such cases in debian/rules, shout
+ at the buildd maintainer, and ignore the result of our test suite.
+
+ -- Peter Palfrader <weasel at debian.org> Tue, 13 Sep 2005 19:18:39 +0200
+
tor (0.1.0.14-1) unstable; urgency=high
* New upstream version - changes, among others:
Index: control
===================================================================
RCS file: /home/or/cvsroot/tor/debian/control,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- control 9 Aug 2005 13:11:00 -0000 1.19
+++ control 14 Sep 2005 13:05:58 -0000 1.20
@@ -2,7 +2,7 @@
Section: comm
Priority: optional
Maintainer: Peter Palfrader <weasel at debian.org>
-Build-Depends: debhelper (>= 4.1.65), libssl-dev, dpatch, zlib1g-dev, libevent-dev (>= 1.1), tetex-bin, tetex-extra, transfig, gs
+Build-Depends: debhelper (>= 4.1.65), libssl-dev, dpatch, zlib1g-dev, libevent-dev (>= 1.1), tetex-bin, tetex-extra, transfig, gs, binutils (>= 2.14.90.0.7)
Standards-Version: 3.6.2
Package: tor
@@ -46,3 +46,13 @@
The latest information can be found at http://tor.eff.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})
+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.
Index: rules
===================================================================
RCS file: /home/or/cvsroot/tor/debian/rules,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- rules 9 Sep 2005 21:11:57 -0000 1.20
+++ rules 14 Sep 2005 13:05:58 -0000 1.21
@@ -10,6 +10,7 @@
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+LOCALHOST_IP ?= $(shell getent hosts localhost | awk '{print $$1}')
CFLAGS = -Wall -g
@@ -49,6 +50,7 @@
configure: patch-stamp
config.status: configure
+ @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. Will ignore result of testsuite. Please fix your system/chroot."; echo "######################################################################"; echo; echo; echo; echo; echo "Note: 'getent hosts localhost' should return '127.0.0.1 localhost'"; echo; fi
dh_testdir
CFLAGS="$(CFLAGS)" ./configure \
--host=$(DEB_HOST_GNU_TYPE) \
@@ -70,8 +72,15 @@
@echo
@echo
# Running unit tests
- if [ "$(RUN_TEST)" != "no" ]; then \
- src/or/test; \
+ @if [ "$(RUN_TEST)" != "no" ]; then \
+ if [ "$(LOCALHOST_IP)" != "127.0.0.1" ]; then \
+ echo; echo; echo "######################################################################"; echo "WARNING: This system does not think localhost is 127.0.0.1. Will ignore result of testsuite. Please fix your system/chroot."; echo "######################################################################"; echo; echo; \
+ echo "src/or/test || true"; \
+ src/or/test || true; \
+ else \
+ echo "src/or/test"; \
+ src/or/test; \
+ fi; \
else \
echo -e "\n\nSkipping unittests\n\n"; \
fi
@@ -170,7 +179,8 @@
# dh_installcron
dh_installman
dh_link
- #dh_strip
+ # Change this for debhelper compatibility level 5 or later!
+ dh_strip --dbg-package=tor
dh_compress
dh_fixperms
dh_installdeb
@@ -178,6 +188,7 @@
dh_gencontrol
dh_md5sums
dh_builddeb
+ @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
Index: tor.init
===================================================================
RCS file: /home/or/cvsroot/tor/debian/tor.init,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- tor.init 9 Aug 2005 13:11:00 -0000 1.14
+++ tor.init 14 Sep 2005 13:05:58 -0000 1.15
@@ -1,5 +1,19 @@
#! /bin/sh
+### BEGIN INIT INFO
+# Provides: tor
+# Required-Start: $local_fs, $remote_fs, $network, $named, $time
+# Required-Stop: $local_fs, $remote_fs, $network, $named, $time
+# Should-Start: $syslog
+# Should-Stop: $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Starts The Onion Router daemon processes
+# Description: Start The Onion Router, a TCP overlay
+# network client that provides anonymous
+# transport.
+### END INIT INFO
+
set -e
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
More information about the tor-commits
mailing list