No longer set now obsolete Group setting in built-in debian config

svn:r17354

diff --git a/debian/changelog b/debian/changelog
index 33b2bcfa06045e3f307072b96dd855f28e295009..2eb24159e5cef2cd13dbacb2c50587c4984f7cf6 100644 (file)
--- 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 <weasel@debian.org>  Fri, 21 Nov 2008 23:28:29 +0100
+ -- Peter Palfrader <weasel@debian.org>  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 123dc7119d763cbca0f9104b1003d11176fcda78..f28dfe40b5eef7dd16492b0315eda589ad897f55 100755 (executable)
--- 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;
 +}