From 2af266e7643acafe7c1c290c4e0e10a42d706633 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Fri, 21 Nov 2008 22:33:11 +0000 Subject: [PATCH] No longer set now obsolete Group setting in built-in debian config svn:r17354 --- debian/changelog | 5 +++-- debian/patches/06_add_compile_time_defaults.dpatch | 6 +----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 33b2bcfa06..2eb24159e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -tor (0.2.0.31-2) unstable; urgency=low +tor (0.2.0.32-1) unstable; urgency=low * New upstream version. - Properly drops privileges when being configured to do so (closes: #505178). + * No longer set now obsolete Group setting in built-in debian config. - -- Peter Palfrader Fri, 21 Nov 2008 23:28:29 +0100 + -- Peter Palfrader Fri, 21 Nov 2008 23:32:42 +0100 tor (0.2.0.31-1) unstable; urgency=low diff --git a/debian/patches/06_add_compile_time_defaults.dpatch b/debian/patches/06_add_compile_time_defaults.dpatch index 123dc7119d..f28dfe40b5 100755 --- a/debian/patches/06_add_compile_time_defaults.dpatch +++ b/debian/patches/06_add_compile_time_defaults.dpatch @@ -72,7 +72,7 @@ diff -urNad trunk~/src/or/config.c trunk/src/or/config.c if (errmsg) { log(LOG_WARN,LD_CONFIG,"Failed to parse/validate config: %s", errmsg); tor_free(errmsg); -@@ -5011,3 +5018,64 @@ +@@ -5011,3 +5018,60 @@ puts(routerparse_c_id); } @@ -131,9 +131,5 @@ diff -urNad trunk~/src/or/config.c trunk/src/or/config.c + tor_assert(var); + var->initvalue = tor_strdup("debian-tor"); + -+ var = config_find_option(&options_format, "Group"); -+ tor_assert(var); -+ var->initvalue = tor_strdup("debian-tor"); -+ + return 0; +}