[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] Merge debian directory from tor-0_1_0-patches to HEAD



Update of /home/or/cvsroot/tor/debian
In directory moria:/tmp/cvs-serv11337

Modified Files:
	changelog control rules tor.init 
Added Files:
	hexdump-cell-struct.pdf hexdump-interaction.pdf 
Log Message:
Merge debian directory from tor-0_1_0-patches to HEAD

Index: changelog
===================================================================
RCS file: /home/or/cvsroot/tor/debian/changelog,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- changelog	17 May 2005 14:37:00 -0000	1.120
+++ changelog	9 Aug 2005 13:11:00 -0000	1.121
@@ -1,6 +1,55 @@
-tor (0.1.0.7-rc-200505171420-1) UNRELEASED; urgency=low
+tor (0.1.0.14-1) unstable; urgency=high
 
-  * CVS snapshot: 2005-05-17 14:20 UTC.
+  * New upstream version - changes, among others:
+    - Fixes the other half of the bug with crypto handshakes.
+  * Since gs-gpl on s390 is broken (#321435) and unable to
+    build PDFs of our images for the design paper this version
+    ships them in the source and uses them on s390, should building
+    them from source really fail.
+  * Increase standards-version from 3.6.1 to 3.6.2.  No changes
+    necessary.
+
+ -- Peter Palfrader <weasel@xxxxxxxxxx>  Mon,  8 Aug 2005 23:55:05 +0200
+
+tor (0.1.0.13-1) unstable; urgency=high
+
+  * New upstream version:
+    - Explicitly set no-unaligned-access for sparc in configure.in.
+      it turns out the new gcc's let you compile broken code, but
+      that doesn't make it not-broken (closes: #320140).
+    - Fix a critical bug in the security of our crypto handshakes.
+      (Therefore set urgency to high).
+    and more (see upstream changelog).
+  * Slightly improve init script to give you proper error messages when
+    you do not run it as root.
+
+ -- Peter Palfrader <weasel@xxxxxxxxxx>  Fri,  5 Aug 2005 01:27:49 +0200
+
+tor (0.1.0.12-1) unstable; urgency=medium
+
+  * New upstream version:
+    - New IP for tor26 directory server,
+    - fix a possible double-free in tor_gzip_uncompress,
+    - and more (see upstream changelog).
+
+ -- Peter Palfrader <weasel@xxxxxxxxxx>  Tue, 19 Jul 2005 17:36:24 +0200
+
+tor (0.1.0.11-1) unstable; urgency=high
+
+  * New upstream version (closes: #316753):
+    - Fixes a serious bug: servers now honor their exit policies -
+      In 0.1.0.x only clients enforced them so far.  0.0.9.x is
+      not affected.
+  * Build depend on libevent-dev >= 1.1.
+  * Urgency high because 0.0.9.10-1 did not make it into testing after
+    like 3 weeks because of an impending ftp-master move.  So I might
+    just as well upload this one.
+
+ -- Peter Palfrader <weasel@xxxxxxxxxx>  Mon,  4 Jul 2005 17:53:48 +0200
+
+tor (0.1.0.10-0.pre.1) UNRELEASED; urgency=low
+
+  * New upstream version.
   * Add a watch file.
   * Forward port 03_tor_manpage_in_section_8.
   * Forward port 06_add_compile_time_defaults.
@@ -14,8 +63,20 @@
     Of course the -dev package needs to be installed.
   * Update README.Debian to say that upstream now does have a default
     for DataDirectory.
+  * Don't fail in the init script when we cannot raise the ulimit.
+    Instead just warn a bit (closes: #312882).
 
- -- Peter Palfrader <weasel@xxxxxxxxxx>  Tue, 17 May 2005 16:18:35 +0200
+ -- Peter Palfrader <weasel@xxxxxxxxxx>  Wed, 15 Jun 2005 16:38:06 +0200
+
+tor (0.0.9.10-1) unstable; urgency=high
+
+  * While we're waiting for a newer libevent to enter sid, make another
+    upload of the 0.0.9.x tree:
+    - Refuse relay cells that claim to have a length larger than the
+      maximum allowed. This prevents a potential attack that could read
+      arbitrary memory (e.g. keys) from an exit server's process.
+
+ -- Peter Palfrader <weasel@xxxxxxxxxx>  Thu, 16 Jun 2005 22:56:11 +0200
 
 tor (0.0.9.9-1) unstable; urgency=low
 

Index: control
===================================================================
RCS file: /home/or/cvsroot/tor/debian/control,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- control	29 Mar 2005 00:38:03 -0000	1.18
+++ control	9 Aug 2005 13:11:00 -0000	1.19
@@ -2,8 +2,8 @@
 Section: comm
 Priority: optional
 Maintainer: Peter Palfrader <weasel@xxxxxxxxxx>
-Build-Depends: debhelper (>= 4.1.65), libssl-dev, dpatch, zlib1g-dev, libevent-dev (>= 1.0), tetex-bin, tetex-extra, transfig, gs
-Standards-Version: 3.6.1
+Build-Depends: debhelper (>= 4.1.65), libssl-dev, dpatch, zlib1g-dev, libevent-dev (>= 1.1), tetex-bin, tetex-extra, transfig, gs
+Standards-Version: 3.6.2
 
 Package: tor
 Architecture: any



Index: rules
===================================================================
RCS file: /home/or/cvsroot/tor/debian/rules,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- rules	22 Mar 2005 22:38:21 -0000	1.17
+++ rules	9 Aug 2005 13:11:00 -0000	1.18
@@ -77,7 +77,26 @@
 	fi
 	@echo
 
-	# make design paper
+	# XXX
+	# So, gs-gpl on s390 is broken (#321435) and fails to properly build
+	# .pdf files from .fig files using fig2dev.  Therefore we ship them
+	# until this bug is fixed.
+	#
+	# of course we can always give it a try
+	#
+	# the hexdumps were built using something like
+	#   perl -e 'while (<>) { print unpack ("H*", $_); }' interaction.pdf | fold > hexdump-interaction.pdf
+	if [ "$(DEB_BUILD_GNU_TYPE)" = "s390-linux-gnu" ]; then \
+		cd doc/design-paper; \
+		fig2dev -L pdf cell-struct.fig cell-struct.pdf || \
+			( echo "** Using shipped pdf file because fig2dev failed"; \
+			  perl -e 'while (<>) { chomp; print pack ("H*", $$_); }' ../../debian/hexdump-cell-struct.pdf > cell-struct.pdf ); \
+		fig2dev -L pdf interaction.fig interaction.pdf || \
+			( echo "** Using shipped pdf file because fig2dev failed"; \
+			  perl -e 'while (<>) { chomp; print pack ("H*", $$_); }' ../../debian/hexdump-interaction.pdf > interaction.pdf ); \
+	fi
+	# XXX ends
+
 	if [ "$(BUILD_DOC)" != "no" ]; then \
 		make -C doc/design-paper tor-design.ps tor-design.pdf || \
 		( echo -e "*\n*\n*\n*"; \

Index: tor.init
===================================================================
RCS file: /home/or/cvsroot/tor/debian/tor.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- tor.init	10 Mar 2005 18:19:14 -0000	1.13
+++ tor.init	9 Aug 2005 13:11:00 -0000	1.14
@@ -6,7 +6,8 @@
 DAEMON=/usr/sbin/tor
 NAME=tor
 DESC="tor daemon"
-TORPID=/var/run/tor/tor.pid
+TORPIDDIR=/var/run/tor
+TORPID=$TORPIDDIR/tor.pid
 DEFAULTSFILE=/etc/default/$NAME
 WAITFORDAEMON=60
 ARGS=""
@@ -50,20 +51,26 @@
 	if [ "$RUN_DAEMON" != "yes" ]; then
 		echo "Not starting $DESC (Disabled in $DEFAULTSFILE)."
 	else
-		echo "Starting $DESC: $NAME..."
-		ulimit -n $MAX_FILEDESCRIPTORS
-		start-stop-daemon --start --quiet --oknodo \
-			--chuid debian-tor:debian-tor \
-			--pidfile $TORPID \
-			$NICE \
-			--exec $DAEMON -- $ARGS
-		echo "done."
+		if   test ! -d $TORPIDDIR; then echo "There is no $TORPIDDIR directory." >&2; exit 1
+		elif test ! -x $TORPIDDIR; then echo "Cannot access $TORPIDDIR directory, are you root?" >&2; exit 1;
+		else
+			echo "Starting $DESC: $NAME..."
+			ulimit -n $MAX_FILEDESCRIPTORS || echo "Warn: Could not set ulimit for number of file descriptors." >&2
+			start-stop-daemon --start --quiet --oknodo \
+				--chuid debian-tor:debian-tor \
+				--pidfile $TORPID \
+				$NICE \
+				--exec $DAEMON -- $ARGS
+			echo "done."
+		fi
 	fi
 	;;
   stop)
 	echo -n "Stopping $DESC: "
 	pid=`cat $TORPID 2>/dev/null` || true
-	if test ! -f $TORPID -o -z "$pid"
+	if   test ! -d $TORPIDDIR; then echo "There is no $TORPIDDIR directory." >&2; exit 1
+	elif test ! -x $TORPIDDIR; then echo "Cannot access $TORPIDDIR directory, are you root?" >&2; exit 1;
+	elif test ! -f $TORPID -o -z "$pid"
 	then
 		echo "not running (there is no $TORPID)."
 	elif start-stop-daemon --stop --signal INT --quiet --pidfile $TORPID --exec $DAEMON
@@ -80,7 +87,9 @@
   reload|force-reload)
 	echo -n "Reloading $DESC configuration: "
 	pid=`cat $TORPID 2>/dev/null` || true
-	if test ! -f $TORPID -o -z "$pid"
+	if   test ! -d $TORPIDDIR; then echo "There is no $TORPIDDIR directory." >&2; exit 1
+	elif test ! -x $TORPIDDIR; then echo "Cannot access $TORPIDDIR directory, are you root?" >&2; exit 1;
+	elif test ! -f $TORPID -o -z "$pid"
 	then
 		echo "not running (there is no $TORPID)."
 	elif start-stop-daemon --stop --signal 1 --quiet --pidfile $TORPID --exec $DAEMON