From 77bc85f047ca6f3558193b224992f326e21d7369 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 31 May 2009 10:38:24 +0000 Subject: [PATCH 1/8] Be quiet when creating /var/run/tor. No longer inform the user if/when we re-create the /var/run/tor directory in the init script. With /var/run on tmpfs this is completely normal now so our message was just noise. --- debian/changelog | 8 ++++++++ debian/tor.init | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a1c8eb3056..42c7c47ecc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +tor (0.2.1.15-rc-X) XXperimental; urgency=low + + * No longer inform the user if/when we re-create the /var/run/tor + directory in the init script. With /var/run on tmpfs this is + completely normal now so our message was just noise. + + -- Peter Palfrader Sun, 31 May 2009 10:37:22 +0000 + tor (0.2.1.15-rc-1) experimental; urgency=low * New upstream version. diff --git a/debian/tor.init b/debian/tor.init index a798c0cdf2..b018847c08 100644 --- a/debian/tor.init +++ b/debian/tor.init @@ -88,7 +88,7 @@ wait_for_deaddaemon () { check_torpiddir () { if test ! -d $TORPIDDIR; then - echo "There is no $TORPIDDIR directory. Creating one for you." + #echo "There is no $TORPIDDIR directory. Creating one for you." mkdir -m 02700 "$TORPIDDIR" chown debian-tor:debian-tor "$TORPIDDIR" fi From aa278d3181c50df98b7ab0802794ed78616427f0 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 31 May 2009 10:41:08 +0000 Subject: [PATCH 2/8] Remove /var/run/tor from package. Stop shipping /var/run/tor in the package. Only clean up permissions of /var/run/tor in postinst if the directory actually exists. --- debian/changelog | 5 ++++- debian/tor.dirs | 1 - debian/tor.postinst | 8 +++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 42c7c47ecc..9e7a9622db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,11 @@ tor (0.2.1.15-rc-X) XXperimental; urgency=low * No longer inform the user if/when we re-create the /var/run/tor directory in the init script. With /var/run on tmpfs this is completely normal now so our message was just noise. + * Stop shipping /var/run/tor in the package. + * Only clean up permissions of /var/run/tor in postinst if the + directory actually exists. - -- Peter Palfrader Sun, 31 May 2009 10:37:22 +0000 + -- Peter Palfrader Sun, 31 May 2009 10:40:29 +0000 tor (0.2.1.15-rc-1) experimental; urgency=low diff --git a/debian/tor.dirs b/debian/tor.dirs index ca9f98af2d..72d914a77b 100644 --- a/debian/tor.dirs +++ b/debian/tor.dirs @@ -1,7 +1,6 @@ etc/tor var/lib/tor var/log/tor -var/run/tor usr/share/lintian/overrides usr/bin usr/sbin diff --git a/debian/tor.postinst b/debian/tor.postinst index 29d0984298..b9ac61596f 100644 --- a/debian/tor.postinst +++ b/debian/tor.postinst @@ -43,9 +43,11 @@ find /var/lib/tor \( \( ! -user debian-tor \) -o \( ! -group debian-tor \) \) -p find /var/lib/tor -type d -print0 | xargs -0 --no-run-if-empty chmod 02700 find /var/lib/tor -type f -print0 | xargs -0 --no-run-if-empty chmod 00600 -find /var/run/tor \( \( ! -user debian-tor \) -o \( ! -group debian-tor \) \) -print0 | xargs -0 --no-run-if-empty chown debian-tor:debian-tor -find /var/run/tor -type d -print0 | xargs -0 --no-run-if-empty chmod 02750 -find /var/run/tor -type f -print0 | xargs -0 --no-run-if-empty chmod 00600 +if [ -e /var/run/tor ]; then + find /var/run/tor \( \( ! -user debian-tor \) -o \( ! -group debian-tor \) \) -print0 | xargs -0 --no-run-if-empty chown debian-tor:debian-tor + find /var/run/tor -type d -print0 | xargs -0 --no-run-if-empty chmod 02750 + find /var/run/tor -type f -print0 | xargs -0 --no-run-if-empty chmod 00600 +fi find /var/log/tor \( \( ! -user debian-tor \) -o \( ! -group adm \) \) -print0 | xargs -0 --no-run-if-empty chown debian-tor:adm find /var/log/tor -type d -print0 | xargs -0 --no-run-if-empty chmod 02750 From 38447cd4de926441b343fa52201e40428534cf11 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 31 May 2009 10:43:38 +0000 Subject: [PATCH 3/8] Update Standards-Version 3.8.1 Update Standards-Version from 3.8.0 to 3.8.1. No real changes required, we already support nocheck in DEB_BUILD_OPTIONS since August 2004, and we already create our var/run directory in the init script (tho we now no longer ship it either - see above). --- debian/changelog | 8 ++++++-- debian/control | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9e7a9622db..62aa455cf6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -tor (0.2.1.15-rc-X) XXperimental; urgency=low +tor (0.2.1.15-rc-1XXX) XXXerimental; urgency=low * No longer inform the user if/when we re-create the /var/run/tor directory in the init script. With /var/run on tmpfs this is @@ -6,8 +6,12 @@ tor (0.2.1.15-rc-X) XXperimental; urgency=low * Stop shipping /var/run/tor in the package. * Only clean up permissions of /var/run/tor in postinst if the directory actually exists. + * Update Standards-Version from 3.8.0 to 3.8.1. No real changes + required, we already support nocheck in DEB_BUILD_OPTIONS since + August 2004, and we already create our var/run directory in the + init script (tho we now no longer ship it either - see above). - -- Peter Palfrader Sun, 31 May 2009 10:40:29 +0000 + -- Peter Palfrader Sun, 31 May 2009 10:43:21 +0000 tor (0.2.1.15-rc-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 1d13e7f737..e23a9828a4 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: comm Priority: optional Maintainer: Peter Palfrader 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, ghostscript, binutils (>= 2.14.90.0.7) -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 Homepage: https://www.torproject.org/ Package: tor From 83c5650178d9f474ce7072eb717cf8a98cefebb3 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 31 May 2009 11:15:04 +0000 Subject: [PATCH 4/8] Change debhelper compatibility version from 4 to 5 --- debian/changelog | 5 ++++- debian/compat | 2 +- debian/rules | 3 +-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 62aa455cf6..76d560aab8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,8 +10,11 @@ tor (0.2.1.15-rc-1XXX) XXXerimental; urgency=low required, we already support nocheck in DEB_BUILD_OPTIONS since August 2004, and we already create our var/run directory in the init script (tho we now no longer ship it either - see above). + * Change debhelper compatibility version from 4 to 5: + - Change dh_strip call from --dbg-package=tor + to --dbg-package=tor-dbg. - -- Peter Palfrader Sun, 31 May 2009 10:43:21 +0000 + -- Peter Palfrader Sun, 31 May 2009 11:14:12 +0000 tor (0.2.1.15-rc-1) experimental; urgency=low diff --git a/debian/compat b/debian/compat index b8626c4cff..7ed6ff82de 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +5 diff --git a/debian/rules b/debian/rules index 797d67ea5a..f5aaa95545 100755 --- a/debian/rules +++ b/debian/rules @@ -189,8 +189,7 @@ binary-common: dh_installinit dh_installman dh_link - # Change this for debhelper compatibility level 5 or later! - dh_strip --dbg-package=tor + dh_strip --dbg-package=tor-dbg dh_compress dh_fixperms dh_installdeb From 6190c8145474d47e00805be9cf1f842437b2d53a Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 31 May 2009 13:18:53 +0200 Subject: [PATCH 5/8] Update versioned build time dependency on debhelper --- debian/changelog | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 76d560aab8..425b56bacd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,8 +13,9 @@ tor (0.2.1.15-rc-1XXX) XXXerimental; urgency=low * Change debhelper compatibility version from 4 to 5: - Change dh_strip call from --dbg-package=tor to --dbg-package=tor-dbg. + - Update versioned build time dependency on debhelper. - -- Peter Palfrader Sun, 31 May 2009 11:14:12 +0000 + -- Peter Palfrader Sun, 31 May 2009 13:18:47 +0200 tor (0.2.1.15-rc-1) experimental; urgency=low diff --git a/debian/control b/debian/control index e23a9828a4..79ba422307 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: tor Section: comm Priority: optional Maintainer: Peter Palfrader -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, ghostscript, binutils (>= 2.14.90.0.7) +Build-Depends: debhelper (>= 5), libssl-dev, dpatch, zlib1g-dev, libevent-dev (>= 1.1), texlive-base-bin, texlive-latex-base, texlive-fonts-recommended, transfig, ghostscript, binutils (>= 2.14.90.0.7) Standards-Version: 3.8.1 Homepage: https://www.torproject.org/ From ee2cdd1ddf326b2d3c35305832504ee65f79f17a Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 20 Jun 2009 13:00:10 +0200 Subject: [PATCH 6/8] New upstream version --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 425b56bacd..c83d1f8eab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -tor (0.2.1.15-rc-1XXX) XXXerimental; urgency=low +tor (0.2.1.16-rc-1) unreleased; urgency=low + * New upstream version. * No longer inform the user if/when we re-create the /var/run/tor directory in the init script. With /var/run on tmpfs this is completely normal now so our message was just noise. @@ -15,7 +16,7 @@ tor (0.2.1.15-rc-1XXX) XXXerimental; urgency=low to --dbg-package=tor-dbg. - Update versioned build time dependency on debhelper. - -- Peter Palfrader Sun, 31 May 2009 13:18:47 +0200 + -- Peter Palfrader Sat, 20 Jun 2009 12:59:29 +0200 tor (0.2.1.15-rc-1) experimental; urgency=low From 6be66447e76fb6a52c0cc47346611c02fbe29a83 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 20 Jun 2009 13:00:41 +0200 Subject: [PATCH 7/8] Forward port 06_add_compile_time_defaults --- debian/changelog | 3 ++- debian/patches/06_add_compile_time_defaults.dpatch | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c83d1f8eab..620917081b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,8 +15,9 @@ tor (0.2.1.16-rc-1) unreleased; urgency=low - Change dh_strip call from --dbg-package=tor to --dbg-package=tor-dbg. - Update versioned build time dependency on debhelper. + * Forward port 06_add_compile_time_defaults. - -- Peter Palfrader Sat, 20 Jun 2009 12:59:29 +0200 + -- Peter Palfrader Sat, 20 Jun 2009 13:00:14 +0200 tor (0.2.1.15-rc-1) experimental; urgency=low diff --git a/debian/patches/06_add_compile_time_defaults.dpatch b/debian/patches/06_add_compile_time_defaults.dpatch index 7dfce2ef23..a2472d1db8 100755 --- a/debian/patches/06_add_compile_time_defaults.dpatch +++ b/debian/patches/06_add_compile_time_defaults.dpatch @@ -50,7 +50,7 @@ diff -urNad tor-trunk~/src/or/config.c tor-trunk/src/or/config.c + if (debian_config_fix_defaults() < 0) + goto err; + - if (argv) { /* first time we're called. save commandline args */ + if (argv) { /* first time we're called. save command line args */ backup_argv = argv; backup_argc = argc; @@ -5307,3 +5313,62 @@ From f3f36fafc37464b599e22ef9d58c4508e7dad48b Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 20 Jun 2009 13:16:19 +0200 Subject: [PATCH 8/8] Release 0.2.1.16-rc-1 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 620917081b..234de20f59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -tor (0.2.1.16-rc-1) unreleased; urgency=low +tor (0.2.1.16-rc-1) experimental; urgency=low * New upstream version. * No longer inform the user if/when we re-create the /var/run/tor @@ -17,7 +17,7 @@ tor (0.2.1.16-rc-1) unreleased; urgency=low - Update versioned build time dependency on debhelper. * Forward port 06_add_compile_time_defaults. - -- Peter Palfrader Sat, 20 Jun 2009 13:00:14 +0200 + -- Peter Palfrader Sat, 20 Jun 2009 13:16:02 +0200 tor (0.2.1.15-rc-1) experimental; urgency=low