Bug#593923: unblock: tork/0.33-1
Package: release.debian.org
Severity: wishlist
Hello,
please unblock tork 0.33-1 from unstable.
There are only two upstream changes:
1) don't log netstat output if tork is running as a relay
2) fixed version number
Why I didn't implement this as a patch?
The old 0.32~pre1 was an unofficial release without a public tarball.
For stable it is much better to have got a public released version.
diffstat:
ChangeLog | 6 +
configure | 277 ++++++++++++++++++++++++++++++------------------------
create-release.sh | 4
debian/changelog | 7 +
debian/control | 2
src/main.cpp | 4
src/tork.cpp | 10 +
src/version.h | 6 -
8 files changed, 183 insertions(+), 133 deletions(-)
The differences in configure looks like they only come from an autoreconfigure.
The rest of the upstream changes are safe:
diff -Naur tork-0.32~pre1/src//main.cpp tork-0.33/src//main.cpp
--- tork-0.32~pre1/src//main.cpp 2008-12-14 15:50:05.000000000 +0100
+++ tork-0.33/src//main.cpp 2010-07-24 14:24:04.000000000 +0200
@@ -1,5 +1,5 @@
/***************************************************************************
- ** $Id: main.cpp,v 1.60 2008/12/14 14:50:05 hoganrobert Exp $
+ ** $Id: main.cpp,v 1.61 2010/07/24 12:24:04 hoganrobert Exp $
* Copyright (C) 2006 - 2008 Robert Hogan *
* robert@roberthogan.net *
* *
@@ -38,7 +38,7 @@
"quality, suitability or anything else.");
static const char version[] = "";
-static const char title[] = "TorK 0.31";
+static const char title[] = "TorK 0.33";
static KCmdLineOptions options[] =
{
diff -Naur tork-0.32~pre1/src//tork.cpp tork-0.33/src//tork.cpp
--- tork-0.32~pre1/src//tork.cpp 2009-10-20 22:13:54.000000000 +0200
+++ tork-0.33/src//tork.cpp 2010-07-24 14:18:36.000000000 +0200
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: tork.cpp,v 1.201 2009/10/20 20:13:54 hoganrobert Exp $
+ * $Id: tork.cpp,v 1.202 2010/07/24 12:18:36 hoganrobert Exp $
* Copyright (C) 2006 - 2008 Robert Hogan *
* robert@roberthogan.net *
* *
@@ -3939,7 +3939,9 @@
void tork::startNetStat()
{
- if (!TorkConfig::logNonTorTraffic())
+ // Don't log netstat traffic if the feature is disabled or we are running a relay
+ if (!TorkConfig::logNonTorTraffic()
+ || !TorkConfig::clientOnly())
return;
netstatproc = new KProcIO();
@@ -3984,6 +3986,10 @@
int pos;
QString item2;
+ // Don't print netstat output if we are running a relay
+ if (!TorkConfig::clientOnly())
+ return;
+
if (!(netstatproc))
return;
diff -Naur tork-0.32~pre1/src//version.h tork-0.33/src//version.h
--- tork-0.32~pre1/src//version.h 2009-01-17 16:49:08.000000000 +0100
+++ tork-0.33/src//version.h 2010-07-24 14:21:14.000000000 +0200
@@ -1,5 +1,5 @@
/***************************************************************************
- * $Id: version.h,v 1.41 2009/01/17 15:49:08 hoganrobert Exp $
+ * $Id: version.h,v 1.42 2010/07/24 12:21:14 hoganrobert Exp $
* Copyright (C) 2006 - 2008 Robert Hogan *
* robert@roberthogan.net *
* *
@@ -19,6 +19,6 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#define VERSION_TORK 0.31
-#define TORK_VERSION "0.31"
+#define VERSION_TORK 0.33
+#define TORK_VERSION "0.33"
-- System Information:
Debian Release: 5.0.5
APT prefers stable
APT policy: (500, 'stable')
Architecture: i386 (i686)
Reply to: